diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmindex/CrmIndexController.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmindex/CrmIndexController.java index cf568387..9036a8f0 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmindex/CrmIndexController.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/crmindex/CrmIndexController.java @@ -25,10 +25,10 @@ public class CrmIndexController { @GetMapping("/getCount") @Operation(summary = "首页统计") - public CommonResult getCount(@RequestParam(name = "relation",defaultValue = "my",required=false) String relation) { - return success(crmIndexService.getIndexCount(relation)); + public CommonResult getCount(@RequestParam(name = "relation", defaultValue = "my", required = false) String relation, + @RequestParam(name = "userId", required = false) Long userId) { + return success(crmIndexService.getIndexCount(relation, userId)); } - } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmindex/CrmIndexService.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmindex/CrmIndexService.java index 907ac0d6..869df5b4 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmindex/CrmIndexService.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmindex/CrmIndexService.java @@ -9,6 +9,6 @@ import cn.iocoder.yudao.module.crm.controller.admin.crmindex.vo.CrmIndexRespVO; */ public interface CrmIndexService { - CrmIndexRespVO getIndexCount(String relation); + CrmIndexRespVO getIndexCount(String relation,Long userId); } diff --git a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmindex/CrmIndexServiceImpl.java b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmindex/CrmIndexServiceImpl.java index 05fb4b4f..e77267c2 100644 --- a/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmindex/CrmIndexServiceImpl.java +++ b/yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmindex/CrmIndexServiceImpl.java @@ -71,47 +71,9 @@ public class CrmIndexServiceImpl implements CrmIndexService { @Override - public CrmIndexRespVO getIndexCount(String relation) { -// Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); -// Date todayStart = DateUtil.beginOfDay(new Date()); -// Date todayEnd = DateUtil.endOfDay(new Date()); -// Date day30 = DateUtil.offsetDay(new Date(),30); -// -// Long followCustomerCount = customerMapper.selectCount(new LambdaQueryWrapper() -// .between(CrmCustomerDO::getNextTime,todayStart,todayEnd).eq(CrmCustomerDO::getOwnerUserId,loginUserId)); -// Long followBusinessCount = businessMapper.selectCount(new LambdaQueryWrapper() -// .between(CrmBusinessDO::getNextTime,todayStart,todayEnd).eq(CrmBusinessDO::getOwnerUserId,loginUserId)); -// Long followCluesCount = crmCluesMapper.selectCount(new LambdaQueryWrapper() -// .between(CrmCluesDO::getNextTime,todayStart,todayEnd).eq(CrmCluesDO::getOwnerUserId,loginUserId)); -// Long contractDueCount = contractMapper.selectCount(new LambdaQueryWrapper() -// .between(CrmContractDO::getEndTime,todayStart,day30).eq(CrmContractDO::getOwnerUserId,loginUserId)); -// Long customerDueCount = 0L; -// Long contractReturnCount = contractMapper.selectCount(new LambdaQueryWrapper() -// .eq(CrmContractDO::getOwnerUserId,loginUserId).apply("money > return_money")); -// Long myInvoiceCount = crmInvoiceMapper.selectCount(new LambdaQueryWrapper() -// .eq(CrmInvoiceDO::getCreator,loginUserId)); -// Long productCount = storeProductMapper.selectCount(); -// -// Long contractCheckCount = contractMapper.selectCount(new LambdaQueryWrapper() -// .apply( "FIND_IN_SET ('" + loginUserId + "',flow_admin_id)")); -// Long receivablesCheckCount = contractReceivablesMapper.selectCount(new LambdaQueryWrapper() -// .apply( "FIND_IN_SET ('" + loginUserId + "',flow_admin_id)")); -// Long invoiceCheckCount = crmInvoiceMapper.selectCount(new LambdaQueryWrapper() -// .apply( "FIND_IN_SET ('" + loginUserId + "',flow_admin_id)")); - + public CrmIndexRespVO getIndexCount(String relation, Long userId) { return CrmIndexRespVO.builder() -// .followCustomerCount(followCustomerCount) -// .followBusinessCount(followBusinessCount) -// .followCluesCount(followCluesCount) -// .contractDueCount(contractDueCount) -// .customerDueCount(customerDueCount) -// .contractReturnCount(contractReturnCount) -// .myInvoiceCount(myInvoiceCount) -// .productCount(productCount) -// .contractCheckCount(contractCheckCount) -// .receivablesCheckCount(receivablesCheckCount) -// .invoiceCheckCount(invoiceCheckCount) - .brieCountVO(getBrieCount(relation)) + .brieCountVO(getBrieCount(relation, userId)) .build(); } @@ -120,7 +82,7 @@ public class CrmIndexServiceImpl implements CrmIndexService { * * @return */ - private BrieCountVO getBrieCount(String relation) { + private BrieCountVO getBrieCount(String relation, Long userId) { Long loginUserId = SecurityFrameworkUtils.getLoginUserId(); Date todayStart = DateUtil.beginOfDay(new Date()); Date todayEnd = DateUtil.endOfDay(new Date());