企微托管

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/OpenAddMemberExcelHandler.java

+package com.gic.haoban.manage.web.controller.open;
+
+import com.alibaba.fastjson.JSON;
+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.EntityUtil;
+import com.gic.enterprise.api.dto.EnterpriseDTO;
+import com.gic.enterprise.api.service.EnterpriseService;
+import com.gic.haoban.manage.web.vo.open.AddMemberExcelVO;
+import com.gic.haoban.manage.web.vo.open.OpenQwAlarmLogExcelVO;
+import com.gic.haoban.task.manage.api.dto.open.OpenQwAddTaskMemberDTO;
+import com.gic.haoban.task.manage.api.dto.open.OpenQwAlarmLogDTO;
+import com.gic.haoban.task.manage.api.qdto.open.AddTaskMemberPageQDTO;
+import com.gic.haoban.task.manage.api.qdto.open.AlarmWordsLogQDTO;
+import com.gic.haoban.task.manage.api.service.OpenQwApiService;
+import com.gic.web.common.download.DownloadHandlerAbstract;
+import com.gic.web.common.download.context.Context;
+import org.apache.commons.collections.CollectionUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedHashMap;
+import java.util.List;
+
+@Service
+public class OpenAddMemberExcelHandler extends DownloadHandlerAbstract<AddMemberExcelVO> {
+
+    @Autowired
+    private OpenQwApiService openQwApiService;
+
+    @Override
+    public List<AddMemberExcelVO> getData(Context context, String json, Integer currentPage) {
+        AddTaskMemberPageQDTO qdto = JSON.parseObject(json, AddTaskMemberPageQDTO.class);
+        BasePageInfo pageInfo = new BasePageInfo();
+        pageInfo.setPageSize(this.getPageSize());
+        pageInfo.setPageNum(currentPage);
+        ServiceResponse<Page<OpenQwAddTaskMemberDTO>> page = this.openQwApiService.addFriendPage(qdto, pageInfo);
+        List<AddMemberExcelVO> voList = new ArrayList<>();
+        if (null != page && CollectionUtils.isNotEmpty(page.getResult().getResult())) {
+            for (OpenQwAddTaskMemberDTO item : page.getResult().getResult()) {
+                AddMemberExcelVO vo = EntityUtil.changeEntityByJSON(AddMemberExcelVO.class, item);
+                voList.add(vo);
+            }
+        }
+        return voList;
+    }
+
+    @Override
+    public List<String> getColumnNames() {
+        return Arrays.asList("成员姓名", "导购姓名", "导购code", "导购所属门店名称", "导购所属门店code", "会话类型", "客户姓名", "客户昵称", "客户手机号", "状态", "添加好友时间", "申请添加时间");
+    }
+
+    @Override
+    public LinkedHashMap<String, List<String>> doubleColumnNames() {
+        return null;
+    }
+
+    @Override
+    public List<String> getColumns() {
+        return Arrays.asList("staffName", "clerkName", "clerkCode", "storeName", "storeCode", "chatTypeExcel", "memberName", "memberNick", "memberPhone", "statusExcel", "addTimeExcel", "applyTimeExcel");
+    }
+
+    @Override
+    public Integer getPageSize() {
+        return 1000;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/OpenAlarmWordsLogExcelHandler.java

@@ -27,8 +27,6 @@ public class OpenAlarmWordsLogExcelHandler extends DownloadHandlerAbstract<OpenQ
 
     @Autowired
     private OpenQwApiService openQwApiService ;
-    @Autowired
-    private EnterpriseService enterpriseService ;
 
     @Override
     public List<OpenQwAlarmLogExcelVO> getData(Context context, String json, Integer currentPage) {
@@ -39,7 +37,6 @@ public class OpenAlarmWordsLogExcelHandler extends DownloadHandlerAbstract<OpenQ
         ServiceResponse<Page<OpenQwAlarmLogDTO>> page = this.openQwApiService.alarmWordsLogPage(qdto, pageInfo);
         List<OpenQwAlarmLogExcelVO> voList = new ArrayList<>();
         if (null != page && CollectionUtils.isNotEmpty(page.getResult().getResult())) {
-            EnterpriseDTO en = this.enterpriseService.getEnterpriseById(qdto.getEnterpriseId()) ;
             for(OpenQwAlarmLogDTO item : page.getResult().getResult()) {
                 OpenQwAlarmLogExcelVO vo = EntityUtil.changeEntityByJSON(OpenQwAlarmLogExcelVO.class,item) ;
                 if(item.getChatType()==1) {

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/controller/open/QywxOpenTaskController.java

 package com.gic.haoban.manage.web.controller.open;
 
+import cn.hutool.core.date.DatePattern;
+import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.BasePageInfo;
+import com.gic.api.base.commons.JSONResponse;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.clerk.api.dto.AuthorizedUser;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
 import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.common.utils.EntityUtil;
+import com.gic.haoban.manage.web.qo.open.AddTaskDataQO;
+import com.gic.haoban.manage.web.qo.open.AddTaskMemberPageQO;
 import com.gic.haoban.manage.web.qo.open.AddTaskPageQO;
 import com.gic.haoban.manage.web.utils.CreatorUtils;
-import com.gic.haoban.task.manage.api.dto.open.OpenQwAddTaskDTO;
-import com.gic.haoban.task.manage.api.dto.open.OpenQwAddTaskSettingDTO;
-import com.gic.haoban.task.manage.api.dto.open.OpenQwAutoSendDTO;
-import com.gic.haoban.task.manage.api.dto.open.OpenQwDelTaskDTO;
+import com.gic.haoban.task.manage.api.dto.open.*;
+import com.gic.haoban.task.manage.api.qdto.open.AddTaskMemberPageQDTO;
+import com.gic.haoban.task.manage.api.qdto.open.AlarmWordsLogQDTO;
 import com.gic.haoban.task.manage.api.qdto.open.QwAddTaskPageQDTO;
 import com.gic.haoban.task.manage.api.service.OpenQwApiService;
+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 org.apache.commons.collections.CollectionUtils;
 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 java.util.Date;
 import java.util.List;
 
 /**
@@ -31,20 +42,22 @@ import java.util.List;
 public class QywxOpenTaskController {
 
     @Autowired
-    private OpenQwApiService openQwApiService ;
+    private OpenQwApiService openQwApiService;
+    @Autowired
+    private OpenAddMemberExcelHandler openAddMemberExcelHandler;
 
     /**
      * 加好友任务列表
      */
     @RequestMapping("page-add-task")
-    public RestResponse<Page<OpenQwAddTaskDTO>> pageAdTask(@RequestBody AddTaskPageQO qo) {
+    public RestResponse<Page<OpenQwAddTaskDTO>> pageAddTask(@RequestBody AddTaskPageQO qo) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
-        String enterpriseId = loginUser.getEnterpriseId() ;
-        BasePageInfo basePageInfo = new BasePageInfo() ;
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
+        BasePageInfo basePageInfo = new BasePageInfo();
         basePageInfo.setPageNum(qo.getPageNum());
         basePageInfo.setPageSize(qo.getPageSize());
-        QwAddTaskPageQDTO qdto = EntityUtil.changeEntityByJSON(QwAddTaskPageQDTO.class,qo) ;
+        QwAddTaskPageQDTO qdto = EntityUtil.changeEntityByJSON(QwAddTaskPageQDTO.class, qo);
         qdto.setWxEnterpriseId(wxEnterpriseId);
         qdto.setEnterpriseId(enterpriseId);
         // 创建人
@@ -52,166 +65,256 @@ public class QywxOpenTaskController {
         if (CollectionUtils.isNotEmpty(creatorIdList)) {
             qdto.setCreatorIdList(creatorIdList);
         }
-        ServiceResponse<Page<OpenQwAddTaskDTO>> resp = this.openQwApiService.addTaskPage(qdto,basePageInfo) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        ServiceResponse<Page<OpenQwAddTaskDTO>> resp = this.openQwApiService.addTaskPage(qdto, basePageInfo);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult()) ;
+        return RestResponse.successResult(resp.getResult());
     }
 
     /**
      * 保存更新加好友任务
+     *
      * @param dto
      * @return
      */
     @RequestMapping("save-add-task")
     public RestResponse<OpenQwAddTaskDTO> saveAddTask(@RequestBody OpenQwAddTaskDTO dto) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
-        String enterpriseId = loginUser.getEnterpriseId() ;
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setEnterpriseId(enterpriseId);
-        ServiceResponse<OpenQwAddTaskDTO> resp = this.openQwApiService.saveAddTask(dto) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        ServiceResponse<OpenQwAddTaskDTO> resp = this.openQwApiService.saveAddTask(dto);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult()) ;
+        return RestResponse.successResult(resp.getResult());
     }
 
     /**
      * 获取加好友任务详情
+     *
      * @param addTaskId
      * @return
      */
     @RequestMapping("get-add-task")
     public RestResponse<OpenQwAddTaskDTO> getAddTask(Long addTaskId) {
-        ServiceResponse<OpenQwAddTaskDTO> resp = this.openQwApiService.getAddTask(addTaskId) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        ServiceResponse<OpenQwAddTaskDTO> resp = this.openQwApiService.getAddTask(addTaskId);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult()) ;
+        return RestResponse.successResult(resp.getResult());
     }
 
     /**
      * 终止加好友任务
+     *
      * @param addTaskId
      * @return
      */
     @RequestMapping("stop-add-task")
     public RestResponse<Void> stopAddTask(Long addTaskId) {
-        ServiceResponse<Void> resp = this.openQwApiService.updateAddTaskStatus(addTaskId,1) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        ServiceResponse<Void> resp = this.openQwApiService.updateAddTaskStatus(addTaskId, 1);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
+        }
+        return RestResponse.successResult();
+    }
+
+
+    /**
+     * 加好友任务-添加明细列表
+     */
+    @RequestMapping("page-add-task-member")
+    public RestResponse<Page<OpenQwAddTaskMemberDTO>> pageAddTaskMember(@RequestBody AddTaskMemberPageQO qo) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
+        BasePageInfo basePageInfo = new BasePageInfo();
+        basePageInfo.setPageNum(qo.getPageNum());
+        basePageInfo.setPageSize(qo.getPageSize());
+        AddTaskMemberPageQDTO qdto = EntityUtil.changeEntityByJSON(AddTaskMemberPageQDTO.class, qo);
+        qdto.setWxEnterpriseId(wxEnterpriseId);
+        qdto.setEnterpriseId(enterpriseId);
+        ServiceResponse<Page<OpenQwAddTaskMemberDTO>> resp = this.openQwApiService.addFriendPage(qdto, basePageInfo);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult() ;
+        return RestResponse.successResult(resp.getResult());
     }
 
+    /**
+     * 加好友任务-添加明细列表
+     */
+    @RequestMapping("add-task-member-excel")
+    public RestResponse<String> addTaskMemberExcel(@RequestBody AddTaskMemberPageQO qo) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        AddTaskMemberPageQDTO qdto = EntityUtil.changeEntityByJSON(AddTaskMemberPageQDTO.class, qo);
+        qdto.setWxEnterpriseId(loginUser.getWxEnterpriseId());
+        qdto.setEnterpriseId(loginUser.getEnterpriseId());
+        BasePageInfo basePageInfo = new BasePageInfo();
+        basePageInfo.setPageNum(1);
+        basePageInfo.setPageSize(1);
+        ServiceResponse<Page<OpenQwAddTaskMemberDTO>> pageResp = this.openQwApiService.addFriendPage(qdto, basePageInfo);
+        final int totalCount = pageResp.getResult().getTotalCount();
+        if (totalCount == 0) {
+            return RestResponse.failure("9999", "导出数据条数为0");
+        }
+        AuthorizedUser user = new AuthorizedUser();
+        user.setUserId(loginUser.getClerkId());
+        user.setEnterpriseId(loginUser.getEnterpriseId());
+        user.setRealName(loginUser.getClerkName());
+        String fileName = "好办自动加好友";
+        Date startDate = qo.getStartDate();
+        Date endDate = qo.getEndDate();
+        if (null != startDate && null != endDate) {
+            fileName = fileName + "-" + DateUtil.formatString(startDate, "yyyy-MM-dd") + "到" + DateUtil.formatString(endDate, "yyyy-MM-dd");
+        }
+        // 1.组装数据查询条件
+        DownloadTask task = new DownloadTask();
+        task.setTaskTypeEnum(TaskTypeEnum.HAOBAN_OPEN_ADD);
+        task.setUser(user);
+        task.setDataType(qo.getDataType());
+        task.setTotalCount(totalCount);
+        task.setFileName(fileName);
+        task.setChannelName(TaskTypeEnum.HAOBAN_OPEN_ADD.getName());
+        task.setBucketName(BucketNameEnum.REPORT_50000.getName());
+        task.setSearchDataParams(JSON.toJSONStringWithDateFormat(qdto, DatePattern.NORM_DATETIME_PATTERN));
+        task.setHandler(openAddMemberExcelHandler);
+        JSONResponse jsonResponse = DownloadTaskUtil.createDownloadTask(task);
+        final String reportId;
+        if (jsonResponse.isSuccess()) {
+            reportId = (String) jsonResponse.getResult();
+        } else {
+            return RestResponse.failure("9999", jsonResponse.getErrorMessage());
+        }
+        return RestResponse.successResult(reportId);
+    }
+
+    /**
+     * 加好友数据图表
+     */
+    @RequestMapping("list-add-data")
+    public RestResponse<List<OpenQwAddTaskDataDTO>> pageAdTask(@RequestBody AddTaskDataQO qo) {
+        ServiceResponse<List<OpenQwAddTaskDataDTO>> resp = this.openQwApiService.taskData(qo.getAddTaskId(), qo.getStartDate(), qo.getEndDate());
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
+        }
+        return RestResponse.successResult(resp.getResult());
+    }
 
     /**
      * 添加好友规则设置
+     *
      * @return
      */
     @RequestMapping("get-add-task-setting")
     public RestResponse<OpenQwAddTaskSettingDTO> getTaskSetting() {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
-        String enterpriseId = loginUser.getEnterpriseId() ;
-        ServiceResponse<OpenQwAddTaskSettingDTO> resp = this.openQwApiService.geAddSetting(wxEnterpriseId,enterpriseId) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
+        ServiceResponse<OpenQwAddTaskSettingDTO> resp = this.openQwApiService.geAddSetting(wxEnterpriseId, enterpriseId);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult()) ;
+        return RestResponse.successResult(resp.getResult());
     }
 
     /**
      * 保存添加好友规则配置
+     *
      * @param dto
      * @return
      */
     @RequestMapping("save-add-task-setting")
     public RestResponse<OpenQwAddTaskSettingDTO> saveTaskSetting(@RequestBody OpenQwAddTaskSettingDTO dto) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
-        String enterpriseId = loginUser.getEnterpriseId() ;
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setEnterpriseId(enterpriseId);
-        ServiceResponse<OpenQwAddTaskSettingDTO> resp = this.openQwApiService.saveAddSetting(dto) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        ServiceResponse<OpenQwAddTaskSettingDTO> resp = this.openQwApiService.saveAddSetting(dto);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult()) ;
+        return RestResponse.successResult(resp.getResult());
     }
 
 
     /**
      * 删除好友配置
+     *
      * @return
      */
     @RequestMapping("get-del-task-setting")
     public RestResponse<OpenQwDelTaskDTO> getDelTaskSetting() {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
-        String enterpriseId = loginUser.getEnterpriseId() ;
-        ServiceResponse<OpenQwDelTaskDTO> resp = this.openQwApiService.getDelTask(wxEnterpriseId,enterpriseId) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
+        ServiceResponse<OpenQwDelTaskDTO> resp = this.openQwApiService.getDelTask(wxEnterpriseId, enterpriseId);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult()) ;
+        return RestResponse.successResult(resp.getResult());
     }
 
     /**
      * 保存删除好友配置
+     *
      * @param dto
      * @return
      */
     @RequestMapping("save-del-task-setting")
     public RestResponse<OpenQwDelTaskDTO> saveDelTaskSetting(@RequestBody OpenQwDelTaskDTO dto) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
-        String enterpriseId = loginUser.getEnterpriseId() ;
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setEnterpriseId(enterpriseId);
-        ServiceResponse<OpenQwDelTaskDTO> resp = this.openQwApiService.saveDelTask(dto) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        ServiceResponse<OpenQwDelTaskDTO> resp = this.openQwApiService.saveDelTask(dto);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult()) ;
+        return RestResponse.successResult(resp.getResult());
     }
 
 
     /**
      * 任务自动执行配置
+     *
      * @return
      */
     @RequestMapping("get-auto-send-task-setting")
     public RestResponse<OpenQwAutoSendDTO> getAutoSendTaskSetting() {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
-        String enterpriseId = loginUser.getEnterpriseId() ;
-        ServiceResponse<OpenQwAutoSendDTO> resp = this.openQwApiService.getAutoSend(wxEnterpriseId,enterpriseId) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
+        ServiceResponse<OpenQwAutoSendDTO> resp = this.openQwApiService.getAutoSend(wxEnterpriseId, enterpriseId);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult()) ;
+        return RestResponse.successResult(resp.getResult());
     }
 
     /**
      * 保存任务自动执行配置
+     *
      * @param dto
      * @return
      */
     @RequestMapping("save-auto-send-task-setting")
     public RestResponse<OpenQwAutoSendDTO> saveAutoSendTaskSetting(@RequestBody OpenQwAutoSendDTO dto) {
         WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
-        String wxEnterpriseId = loginUser.getWxEnterpriseId() ;
-        String enterpriseId = loginUser.getEnterpriseId() ;
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        String enterpriseId = loginUser.getEnterpriseId();
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setEnterpriseId(enterpriseId);
-        ServiceResponse<OpenQwAutoSendDTO> resp = this.openQwApiService.saveAutoSend(dto) ;
-        if(!resp.isSuccess()) {
-            return RestResponse.failure("9999",resp.getMessage()) ;
+        ServiceResponse<OpenQwAutoSendDTO> resp = this.openQwApiService.saveAutoSend(dto);
+        if (!resp.isSuccess()) {
+            return RestResponse.failure("9999", resp.getMessage());
         }
-        return RestResponse.successResult(resp.getResult()) ;
+        return RestResponse.successResult(resp.getResult());
     }
 
 

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/open/AddTaskDataQO.java

+package com.gic.haoban.manage.web.qo.open;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AddTaskDataQO implements Serializable {
+
+    private Long addTaskId ;
+    private Date startDate ;
+    private Date endDate ;
+
+    public Long getAddTaskId() {
+        return addTaskId;
+    }
+
+    public void setAddTaskId(Long addTaskId) {
+        this.addTaskId = addTaskId;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/qo/open/AddTaskMemberPageQO.java

+package com.gic.haoban.manage.web.qo.open;
+
+import com.gic.api.base.commons.BasePageInfo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AddTaskMemberPageQO extends BasePageInfo implements Serializable {
+
+    private String clerkParams ;
+    private String memberParams ;
+
+    // 1已申请
+    private int status ;
+
+    private Date startDate;
+    private Date endDate;
+
+    private Long addTaskId ;
+
+    private int dataType ;
+
+    public int getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(int dataType) {
+        this.dataType = dataType;
+    }
+
+    public Long getAddTaskId() {
+        return addTaskId;
+    }
+
+    public void setAddTaskId(Long addTaskId) {
+        this.addTaskId = addTaskId;
+    }
+
+    public String getClerkParams() {
+        return clerkParams;
+    }
+
+    public void setClerkParams(String clerkParams) {
+        this.clerkParams = clerkParams;
+    }
+
+    public String getMemberParams() {
+        return memberParams;
+    }
+
+    public void setMemberParams(String memberParams) {
+        this.memberParams = memberParams;
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+
+    public Date getStartDate() {
+        return startDate;
+    }
+
+    public void setStartDate(Date startDate) {
+        this.startDate = startDate;
+    }
+
+    public Date getEndDate() {
+        return endDate;
+    }
+
+    public void setEndDate(Date endDate) {
+        this.endDate = endDate;
+    }
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/open/AddMemberExcelVO.java

+package com.gic.haoban.manage.web.vo.open;
+
+import java.io.Serializable;
+import java.util.Date;
+
+public class AddMemberExcelVO implements Serializable {
+
+    /**
+     * 申请时间
+     */
+    private java.util.Date applyTimeExcel;
+    /**
+     * 加成功时间
+     */
+    private java.util.Date addTimeExcel;
+    /**
+     * 会员Nick
+     */
+    private String memberNick;
+    /**
+     * 会员姓名
+     */
+    private String memberName;
+    /**
+     * 会员卡
+     */
+    private String memberCard;
+    /**
+     * 会员手机号
+     */
+    private String memberPhone;
+    /**
+     * 导购code
+     */
+    private String clerkCode;
+    /**
+     * 导购名称
+     */
+    private String clerkName;
+    /**
+     * 门店
+     */
+    private String storeCode;
+    /**
+     * 门店
+     */
+    private String storeName;
+    private String staffName;
+
+    private String statusExcel;
+
+    public Date getApplyTimeExcel() {
+        return applyTimeExcel;
+    }
+
+    public void setApplyTimeExcel(Date applyTimeExcel) {
+        this.applyTimeExcel = applyTimeExcel;
+    }
+
+    public Date getAddTimeExcel() {
+        return addTimeExcel;
+    }
+
+    public void setAddTimeExcel(Date addTimeExcel) {
+        this.addTimeExcel = addTimeExcel;
+    }
+
+    public String getMemberNick() {
+        return memberNick;
+    }
+
+    public void setMemberNick(String memberNick) {
+        this.memberNick = memberNick;
+    }
+
+    public String getMemberName() {
+        return memberName;
+    }
+
+    public void setMemberName(String memberName) {
+        this.memberName = memberName;
+    }
+
+    public String getMemberCard() {
+        return memberCard;
+    }
+
+    public void setMemberCard(String memberCard) {
+        this.memberCard = memberCard;
+    }
+
+    public String getMemberPhone() {
+        return memberPhone;
+    }
+
+    public void setMemberPhone(String memberPhone) {
+        this.memberPhone = memberPhone;
+    }
+
+    public String getClerkCode() {
+        return clerkCode;
+    }
+
+    public void setClerkCode(String clerkCode) {
+        this.clerkCode = clerkCode;
+    }
+
+    public String getClerkName() {
+        return clerkName;
+    }
+
+    public void setClerkName(String clerkName) {
+        this.clerkName = clerkName;
+    }
+
+    public String getStoreCode() {
+        return storeCode;
+    }
+
+    public void setStoreCode(String storeCode) {
+        this.storeCode = storeCode;
+    }
+
+    public String getStoreName() {
+        return storeName;
+    }
+
+    public void setStoreName(String storeName) {
+        this.storeName = storeName;
+    }
+
+    public String getStaffName() {
+        return staffName;
+    }
+
+    public void setStaffName(String staffName) {
+        this.staffName = staffName;
+    }
+
+    public String getStatusExcel() {
+        return statusExcel;
+    }
+
+    public void setStatusExcel(String statusExcel) {
+        this.statusExcel = statusExcel;
+    }
+}