|
|
@@ -283,7 +283,7 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
if (StringUtils.isNotBlank(cli.getStartDate()))
|
|
|
params.put("startDate", cli.getStartDate());
|
|
|
if (StringUtils.isNotBlank(cli.getEndDate()))
|
|
|
- params.put("endDate", cli.getEndDate());
|
|
|
+ params.put("endDate", cli.getEndDate()+" 23:59:59");
|
|
|
if (StringUtils.isNotBlank(cli.getIndustry()))
|
|
|
params.put("industry", Integer.parseInt(cli.getIndustry()));
|
|
|
if (StringUtils.isNotBlank(cli.getAid()))
|
|
|
@@ -296,10 +296,6 @@ public class CustomerServiceImpl extends BaseMybatisDao<UserMapper> implements C
|
|
|
params.put("societyTag", cli.getSocietyTag());
|
|
|
if (StringUtils.isNotBlank(cli.getFollow()))
|
|
|
params.put("follow", cli.getFollow());
|
|
|
- if (StringUtils.isNotBlank(cli.getStartDate()))
|
|
|
- params.put("startDate", cli.getStartDate() + " 00:00:00");
|
|
|
- if (StringUtils.isNotBlank(cli.getEndDate()))
|
|
|
- params.put("endDate", cli.getEndDate() + " 23:59:59");
|
|
|
if (null != cli.getDataGrade())
|
|
|
params.put("dataGrade", cli.getDataGrade());
|
|
|
if (null != cli.getLevel())
|