Merge branch 'ferture/四月迭代需求' of…

Merge branch 'ferture/四月迭代需求' of http://git.gicdev.com/haoban3.0/haoban-manage3.0.git into ferture/四月迭代需求

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/chat/GroupChatController.java

 package com.gic.haoban.manage.web.controller.chat;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.gic.api.base.commons.JSONResponse;
-import com.gic.clerk.api.dto.AuthorizedUser;
-import com.gic.commons.util.DateUtil;
-import com.gic.commons.util.ExcelUtils;
-import com.gic.enterprise.api.service.EnterpriseService;
-import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
-import com.gic.qcloud.BucketNameEnum;
-import com.gic.web.common.download.DownloadTask;
-import com.gic.web.common.download.DownloadTaskUtil;
-import com.gic.web.common.download.constants.TaskTypeEnum;
-import com.gic.web.common.utils.SessionContextUtils;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.ExcelUtils;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.StaffDTO;
@@ -43,17 +20,29 @@ import com.gic.haoban.manage.api.dto.qdto.chat.GroupChatUserSearchQDTO;
 import com.gic.haoban.manage.api.dto.qdto.chat.OwnerSearchQDTO;
 import com.gic.haoban.manage.api.service.StaffApiService;
 import com.gic.haoban.manage.api.service.chat.GroupChatApiService;
+import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
 import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
 import com.gic.log.record.util.GicLogRecordOptTypeEnum;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 
 /**
- * 
+ *
 * @ClassName: GroupChatController
 * @Description: 群
 * @author xugh
@@ -83,7 +72,7 @@ public class GroupChatController {
     }
 
     /**
-     * 
+     *
     * @Title: save
     * @Description: 认领gic
     * @author xugh
@@ -228,8 +217,7 @@ public class GroupChatController {
      * 客户群列表数据明细导出
      */
     @RequestMapping("customer-group-export")
-    @ResponseBody
-    public RestResponse<Boolean> customerGroupExport(HttpServletRequest request, HttpServletResponse response, GroupChatSearchQDTO qdto) {
+    public RestResponse<Boolean> customerGroupExport(HttpServletRequest request, HttpServletResponse response, @RequestBody GroupChatSearchQDTO qdto) {
         // 登录校验
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
         if (loginUser == null || StringUtils.isBlank(loginUser.getEnterpriseId())) {