|
|
@@ -689,11 +689,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<StatisticBo> customerStatistics(Date sDate, Date eDate, String depId, String businessGlossoryId, Integer pageNo, Integer pageSize) {
|
|
|
+ public Pagination<StatisticBo> customerStatistics(Date sDate, Date eDate, String depNo, String businessGlossoryId, Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object> params = new HashMap<String,Object>();
|
|
|
if(null != sDate) params.put("sDate", sDate);
|
|
|
if(null != eDate) params.put("eDate", eDate);
|
|
|
- if(StringUtils.isNotBlank(depId)) params.put("departmentId", depId);
|
|
|
+ if(StringUtils.isNotBlank(depNo)) params.put("depNo", depNo);
|
|
|
if(StringUtils.isNotBlank(businessGlossoryId)) params.put("businessGlossoryId", businessGlossoryId);
|
|
|
Pagination<StatisticBo> page = (Pagination<StatisticBo>)findPage("customerStatisticsList", "customerStatisticsCount", params, pageNo, pageSize);
|
|
|
return page;
|
|
|
@@ -701,11 +701,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<StatisticBo> businessStatistic(Date sDate, Date eDate,String depId, String businessGlossoryId,Integer pageNo, Integer pageSize) {
|
|
|
+ public Pagination<StatisticBo> businessStatistic(Date sDate, Date eDate,String depNo, String businessGlossoryId,Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object> params = new HashMap<String,Object>();
|
|
|
if(null != sDate) params.put("sDate", sDate);
|
|
|
if(null != eDate) params.put("eDate", eDate);
|
|
|
- if(StringUtils.isNotBlank(depId)) params.put("departmentId", depId);
|
|
|
+ if(StringUtils.isNotBlank(depNo)) params.put("depNo", depNo);
|
|
|
if(StringUtils.isNotBlank(businessGlossoryId)) params.put("businessGlossoryId", businessGlossoryId);
|
|
|
Pagination<StatisticBo> page = (Pagination<StatisticBo>)findPage("businessStatisticList", "businessStatisticCount", params, pageNo, pageSize);
|
|
|
return page;
|
|
|
@@ -713,11 +713,11 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<StatisticBo> followStatistic(Date sDate, Date eDate, String depId, Integer pageNo, Integer pageSize) {
|
|
|
+ public Pagination<StatisticBo> followStatistic(Date sDate, Date eDate, String depNo, Integer pageNo, Integer pageSize) {
|
|
|
Map<String,Object> params = new HashMap<String,Object>();
|
|
|
if(null != sDate) params.put("sDate", sDate);
|
|
|
if(null != eDate) params.put("eDate", eDate);
|
|
|
- if(StringUtils.isNotBlank(depId)) params.put("departmentId", depId);
|
|
|
+ if(StringUtils.isNotBlank(depNo)) params.put("depNo", depNo);
|
|
|
Pagination<StatisticBo> page = (Pagination<StatisticBo>)findPage("followStatisticList", "followStatisticCount", params, pageNo, pageSize);
|
|
|
return page;
|
|
|
}
|