|
|
@@ -2,6 +2,7 @@ package com.goafanti.order.service.impl;
|
|
|
|
|
|
import com.goafanti.common.dao.TOrderNewMapper;
|
|
|
import com.goafanti.common.dao.UserMidMapper;
|
|
|
+import com.goafanti.common.utils.StringUtils;
|
|
|
import com.goafanti.core.mybatis.BaseMybatisDao;
|
|
|
import com.goafanti.core.mybatis.page.Pagination;
|
|
|
import com.goafanti.order.bo.*;
|
|
|
@@ -29,7 +30,7 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
|
|
|
|
|
|
private void addSignSummaryParam(InputSignSummary in, Map<String, Object> map) {
|
|
|
if (in.getUserName()!=null) map.put("userName", in.getUserName());
|
|
|
- if (in.getAid()!=null) map.put("aid", in.getAid());
|
|
|
+ if (StringUtils.isNotBlank(in.getAid())) map.put("aid", in.getAid());
|
|
|
if (in.getFollowAid()!=null) map.put("followAid", in.getFollowAid());
|
|
|
if (in.getMember()!=null) map.put("member", in.getMember());
|
|
|
if (in.getChargeback()!=null) map.put("chargeback", in.getChargeback());
|
|
|
@@ -69,7 +70,7 @@ public class UserStatisticsServiceImpl extends BaseMybatisDao<UserMidMapper> imp
|
|
|
|
|
|
private void addsignStatisticsParam(InputSignStatistics in, Map<String, Object> map) {
|
|
|
if (in.getDepId()!=null)map.put("depId",in.getDepId());
|
|
|
- if (in.getAid()!=null)map.put("aid",in.getAid());
|
|
|
+ if (StringUtils.isNotBlank(in.getAid())) map.put("aid", in.getAid());
|
|
|
if (in.getAmountType()!=null)map.put("amountType",in.getAmountType());
|
|
|
if (in.getSignTimeStart()!=null)map.put("signTimeStart",in.getSignTimeStart());
|
|
|
if (in.getSignTimeEnd()!=null)map.put("signTimeEnd",in.getSignTimeEnd()+" 23:59:59");
|