map 改造

yujian

2019-10-08 0c78c7aaeaa5a427bc8a5c5faf3cd6bbb589c2da

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UserInfoAdminController.java

@@ -19,6 +19,7 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.yeshi.fanli.controller.admin.utils.AdminUtils;

import com.yeshi.fanli.dto.ChartTDO;

import com.yeshi.fanli.entity.bus.user.BindingAccount;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode;

import com.yeshi.fanli.entity.bus.user.ForbiddenUserIdentifyCode.ForbiddenUserIdentifyCodeTypeEnum;

@@ -30,16 +31,16 @@
import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.exception.user.ForbiddenUserIdentifyCodeException;

import com.yeshi.fanli.service.inter.count.UserInfoCountService;

import com.yeshi.fanli.service.inter.hongbao.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.BindingAccountService;

import com.yeshi.fanli.service.inter.money.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.money.extract.BindingAccountService;

import com.yeshi.fanli.service.inter.user.ForbiddenUserIdentifyCodeService;

import com.yeshi.fanli.service.inter.user.UserAccountService;

import com.yeshi.fanli.service.inter.user.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.service.inter.user.UserInfoDeleteRecordService;

import com.yeshi.fanli.service.inter.user.UserInfoExtraService;

import com.yeshi.fanli.service.inter.user.UserInfoService;

import com.yeshi.fanli.service.inter.user.UserMoneyDetailService;

import com.yeshi.fanli.service.inter.user.UserRankService;

import com.yeshi.fanli.service.inter.user.invite.ThreeSaleSerivce;

import com.yeshi.fanli.service.inter.user.tb.UserExtraTaoBaoInfoService;

import com.yeshi.fanli.tag.PageEntity;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.StringUtil;

@@ -857,7 +858,7 @@
         JSONArray line_list = new JSONArray();

         for (String channel : channelList) {



            List<Map<String, Object>> list = userInfoCountService.countNewUserByDate(channel, dateType, year,

            List<ChartTDO> list = userInfoCountService.countNewUserByDate(channel, dateType, year,

                  startTime, endTime);



            if ("all".equalsIgnoreCase(channel)) {

@@ -975,7 +976,7 @@
         JSONArray line_list = new JSONArray();

         for (String channel : channelList) {



            List<Map<String, Object>> list = userInfoCountService.getTodayBuyRate(channel, dateType, year,

            List<ChartTDO> list = userInfoCountService.getTodayBuyRate(channel, dateType, year,

                  startTime, endTime);



            if ("all".equalsIgnoreCase(channel)) {