成员列表新增查询全部成员

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/StaffListDTO.java

@@ -60,6 +60,30 @@ public class StaffListDTO implements Serializable {
      * 部门id数组
      */
     private List<String> departmentIds;
+    /**
+     * 许可到期时间区间查询
+     */
+    private String startTime;
+    /**
+     * 许可到期时间区间查询
+     */
+    private String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 
     public List<String> getDepartmentIds() {
         return departmentIds;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/pojo/bo/StaffListBO.java

@@ -64,6 +64,30 @@ public class StaffListBO implements Serializable {
      * 关联成员id数组
      */
     private List<String> staffIds;
+    /**
+     * 许可到期时间区间查询
+     */
+    private String startTime;
+    /**
+     * 许可到期时间区间查询
+     */
+    private String endTime;
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 
     public List<String> getStaffIds() {
         return staffIds;

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/impl/StaffServiceImpl.java

 package com.gic.haoban.manage.service.service.impl;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-
-import com.gic.haoban.manage.service.pojo.bo.StaffListBO;
-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.stereotype.Service;
 
+import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.UniqueIdUtils;
-import com.gic.haoban.base.api.common.BasePageInfo;
-import com.gic.haoban.common.utils.PageUtil;
 import com.gic.haoban.common.utils.StringUtil;
 import com.gic.haoban.manage.api.dto.StaffDTO;
 import com.gic.haoban.manage.service.config.Config;
@@ -26,6 +14,7 @@ import com.gic.haoban.manage.service.dao.mapper.WxEnterpriseMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanStaff;
 import com.gic.haoban.manage.service.entity.TabHaobanWxEnterprise;
 import com.gic.haoban.manage.service.entity.fee.TabHaobanQywxFeeAccountStaff;
+import com.gic.haoban.manage.service.pojo.bo.StaffListBO;
 import com.gic.haoban.manage.service.service.StaffService;
 import com.gic.haoban.manage.service.service.fee.HaobanQywxFeeAccountStaffService;
 import com.gic.wechat.api.dto.qywx.fee.AccountListDTO;
@@ -34,10 +23,16 @@ import com.gic.wechat.api.dto.qywx.fee.ActiveInfoUserResponseDTO;
 import com.gic.wechat.api.service.qywx.QywxOrderApiService;
 import com.gic.wechat.api.service.qywx.QywxUserApiService;
 import com.github.pagehelper.Page;
-import com.github.pagehelper.PageHelper;
-import com.github.pagehelper.PageInfo;
+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.stereotype.Service;
 
-import cn.hutool.core.date.DateUtil;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class StaffServiceImpl implements StaffService {
@@ -55,7 +50,7 @@ public class StaffServiceImpl implements StaffService {
     private HaobanQywxFeeAccountStaffService haobanQywxFeeAccountStaffService;
     @Autowired
     private QywxUserApiService qywxUserApiService ;
-    
+
     @Override
     public TabHaobanStaff selectById(String id) {
         if (StringUtils.isBlank(id)) {
@@ -98,6 +93,13 @@ public class StaffServiceImpl implements StaffService {
             String s = "ISNULL("+sortField+"),"+sortField;
             staffListBO.setSortField(s);
         }
+        //时间处理
+        if (StrUtil.isNotBlank(staffListBO.getStartTime())) {
+            staffListBO.setStartTime(staffListBO.getStartTime() + " 00:00:00");
+        }
+        if (StrUtil.isNotBlank(staffListBO.getEndTime())) {
+            staffListBO.setEndTime(staffListBO.getEndTime() + " 23:59:59");
+        }
         return mapper.pageStaff(staffListBO);
     }
 
@@ -169,13 +171,13 @@ public class StaffServiceImpl implements StaffService {
     public int resetAddNum() {
         return mapper.resetAddNum();
     }
-    
+
     @Override
     public int updateActiveStatusById(String staffId,  Date activeTime, Date expireTime,
             String activeCode) {
         return mapper.updateActiveStatusById(staffId, activeTime, expireTime, activeCode) ;
     }
-    
+
     @Override
     public void updateOpenConcatFlag(List<String> wxUserIdList,int mixFlag) {
         if(CollectionUtils.isEmpty(wxUserIdList)) {
@@ -183,14 +185,14 @@ public class StaffServiceImpl implements StaffService {
         }
         this.mapper.updateOpenConcatFlag(wxUserIdList,mixFlag);
     }
-    
+
     @Override
     public void activedAccountTimer(String wxEid) {
         log.info("开始查询激活账号,wxEid={}", wxEid);
         TabHaobanWxEnterprise wxEnterprise = this.wxEnterpriseMapper.selectByPrimaryKey(wxEid) ;
         if(wxEnterprise.getWxSecurityType()>0 && StringUtils.isNotEmpty(wxEnterprise.getOpenCorpid()) && wxEnterprise.getStatusFlag()==1) {
             this.haobanQywxFeeAccountStaffService.deleteAll(wxEid) ;
-            this.mapper.deleteActivieInfo(wxEid); 
+            this.mapper.deleteActivieInfo(wxEid);
             this.listAccount(wxEnterprise, 500, null);
         }
     }
@@ -223,7 +225,7 @@ public class StaffServiceImpl implements StaffService {
             }
         }
     }
-    
+
     private void updateAccount(String wxEnterpriseId , String openCorpid ,List<AccountListDTO> list) {
         for(AccountListDTO item : list) {
             String userId = item.getUserid() ;

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

@@ -136,6 +136,13 @@ public class StaffController extends WebBaseController {
         StaffListDTO dto = EntityUtil.changeEntityByJSON(StaffListDTO.class, qo);
         dto.setWxEnterpriseId(wxEnterpriseId);
         dto.setDepartmentIds(departmentIds);
+        if (qo.getGetAllFlag() == 1){
+            //续期订单需要查询所有数据
+            BasePageInfo basePageInfo = new BasePageInfo();
+            basePageInfo.setPageNum(1);
+            basePageInfo.setPageSize(Integer.MAX_VALUE);
+            dto.setPageInfo(basePageInfo);
+        }
         Page<StaffDTO> page = staffApiService.pageStaff(dto);
 
         logger.info("pages={},totalPage={}", page.getCurrentPage(), page.getTotalPage());

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

@@ -50,6 +50,42 @@ public class StaffListQO implements Serializable {
      * 分页参数
      */
     private BasePageInfo pageInfo;
+    /**
+     * 许可到期时间区间查询
+     */
+    private String startTime;
+    /**
+     * 许可到期时间区间查询
+     */
+    private String endTime;
+    /**
+     * 是否查询全部 0 否 1是 默认0
+     */
+    private Integer getAllFlag = 0;
+
+    public Integer getGetAllFlag() {
+        return getAllFlag;
+    }
+
+    public void setGetAllFlag(Integer getAllFlag) {
+        this.getAllFlag = getAllFlag;
+    }
+
+    public String getStartTime() {
+        return startTime;
+    }
+
+    public void setStartTime(String startTime) {
+        this.startTime = startTime;
+    }
+
+    public String getEndTime() {
+        return endTime;
+    }
+
+    public void setEndTime(String endTime) {
+        this.endTime = endTime;
+    }
 
     public String getDepartmentId() {
         return departmentId;