ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ak:5bf4c6648ebf50da46f0aa26093ff34952d64879
Branches Tags
ak:dev
ak:prod
ak:frx
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标
..
compare: ak:743460d18ee29746c9bd4f800ab778de86efa8c7
Branches Tags
ak:dev
ak:prod
ak:frx
ak:dev-aikai-开支日报导出
ak:dev-补录附件
ak:工单-dev
ak:frx_export
ak:dev-erp
ak:crm-业绩目标

No commits in common. "5bf4c6648ebf50da46f0aa26093ff34952d64879" and "743460d18ee29746c9bd4f800ab778de86efa8c7" have entirely different histories.
5bf4c6648e ... 743460d18e

2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/AchievementServiceImpl.java
View File

@ -75,7 +75,7 @@ public class AchievementServiceImpl implements AchievementService {
@Override @Override
public PageResult<UserAchieveVO> getAchievementPage(AchievementPageReqVO pageReqVO) { public PageResult<UserAchieveVO> getAchievementPage(AchievementPageReqVO pageReqVO) {
AdminUserPageApiDTO dto = new AdminUserPageApiDTO(); AdminUserPageApiDTO dto = new AdminUserPageApiDTO();
dto.setNickName(pageReqVO.getName()); dto.setUsername(pageReqVO.getName());
dto.setPageNo(pageReqVO.getPageNo()); dto.setPageNo(pageReqVO.getPageNo());
dto.setPageSize(pageReqVO.getPageSize()); dto.setPageSize(pageReqVO.getPageSize());
PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData(); PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData();

4
yudao-module-crm/yudao-module-crm-biz/src/main/java/cn/iocoder/yudao/module/crm/service/crmanalysis/CustomerServiceImpl.java
View File

@ -128,7 +128,7 @@ public class CustomerServiceImpl implements CustomerService {
@Override @Override
public PageResult<UserVolumeVO> getCustomerVolume(AchievementPageReqVO pageReqVO) { public PageResult<UserVolumeVO> getCustomerVolume(AchievementPageReqVO pageReqVO) {
AdminUserPageApiDTO dto = new AdminUserPageApiDTO(); AdminUserPageApiDTO dto = new AdminUserPageApiDTO();
dto.setNickName(pageReqVO.getName()); dto.setUsername(pageReqVO.getName());
dto.setPageNo(pageReqVO.getPageNo()); dto.setPageNo(pageReqVO.getPageNo());
dto.setPageSize(pageReqVO.getPageSize()); dto.setPageSize(pageReqVO.getPageSize());
PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData(); PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData();
@ -159,7 +159,7 @@ public class CustomerServiceImpl implements CustomerService {
@Override @Override
public PageResult<UserRecordVO> getRecord(AchievementPageReqVO pageReqVO) { public PageResult<UserRecordVO> getRecord(AchievementPageReqVO pageReqVO) {
AdminUserPageApiDTO dto = new AdminUserPageApiDTO(); AdminUserPageApiDTO dto = new AdminUserPageApiDTO();
dto.setNickName(pageReqVO.getName()); dto.setUsername(pageReqVO.getName());
dto.setPageNo(pageReqVO.getPageNo()); dto.setPageNo(pageReqVO.getPageNo());
dto.setPageSize(pageReqVO.getPageSize()); dto.setPageSize(pageReqVO.getPageSize());
PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData(); PageResult<AdminUserApiVO> pageResult = adminUserApi.getUserPage(dto).getCheckedData();