激活码

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java

@@ -20,7 +20,8 @@ public interface StaffApiService {
     List<StaffDepartmentRelatedDTO> listStaffDepartmentByStaffId(String staffId);
 
     Page<StaffDTO> pageStaff(List<String> departmentId, Integer activeFlag,
-                             String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId);
+                             String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId , String permitState,
+                             Integer occupy);
 
     /**
      * 保存微信成员

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/dao/mapper/StaffMapper.java

@@ -35,7 +35,8 @@ public interface StaffMapper {
                              @Param("keyword") String keyword,
                              @Param("departmentIds") List<String> departmentIds,
                              @Param("wxEnterpriseId") String wxEnterpriseId,
-                             @Param("relationFlag") Integer relationFlag);
+                             @Param("relationFlag") Integer relationFlag,@Param("permitState")String permitState,
+                             @Param("occupy")Integer occupy);
 
     List<TabHaobanStaff> listByPhoneNumber(@Param("phoneNumber") String phoneNumber);
 

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

@@ -18,7 +18,8 @@ public interface StaffService {
     String add(TabHaobanStaff tab);
 
     Page<TabHaobanStaff> pageStaff(List<String> staffIds, Integer activeFlag,
-                                   String keyword, List<String> departmentIds, String wxEnterpriseId, Integer relationFlag);
+                                   String keyword, List<String> departmentIds, String wxEnterpriseId, Integer relationFlag,String permitState,
+                                   Integer occupy);
 
     void updateByPrimaryKey(TabHaobanStaff tab);
 

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

@@ -88,11 +88,9 @@ public class StaffServiceImpl implements StaffService {
     }
 
     @Override
-    public Page<TabHaobanStaff> pageStaff(List<String> staffIds, Integer activeFlag, String keyword,List<String> departmentIds,String wxEnterpriseId,Integer relationFlag) {
-
-
-
-        return mapper.pageStaff(staffIds, activeFlag, keyword,departmentIds,wxEnterpriseId,relationFlag);
+    public Page<TabHaobanStaff> pageStaff(List<String> staffIds, Integer activeFlag, String keyword,List<String> departmentIds,String wxEnterpriseId,Integer relationFlag,String permitState,
+            Integer occupy) {
+        return mapper.pageStaff(staffIds, activeFlag, keyword,departmentIds,wxEnterpriseId,relationFlag,permitState,occupy);
     }
 
     @Override

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

@@ -133,13 +133,14 @@ public class StaffApiServiceImpl implements StaffApiService {
     }
 
     @Override
-    public Page<StaffDTO> pageStaff(List<String> departmentIds, Integer activeFlag, String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId) {
+    public Page<StaffDTO> pageStaff(List<String> departmentIds, Integer activeFlag, String keyword, BasePageInfo pageInfo, Integer relationFlag, String wxEnterpriseId,String permitState,
+            Integer occupy) {
         List<String> staffIds = new ArrayList<>();
         if (relationFlag != null) {
             staffIds = staffClerkRelationService.listByWxEnterpriseId(wxEnterpriseId);
         }
         PageHelper.startPage(pageInfo.getPageNum(), pageInfo.getPageSize());
-        Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, keyword, departmentIds, wxEnterpriseId, relationFlag), StaffDTO.class);
+        Page<StaffDTO> page = PageUtil.changePageHelperToCurrentPage(staffService.pageStaff(staffIds, activeFlag, keyword, departmentIds, wxEnterpriseId, relationFlag,permitState,occupy), StaffDTO.class);
         List<StaffDTO> staffDTOList = page.getResult();
         if (CollectionUtils.isEmpty(staffDTOList)) {
             return new Page<>();

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

@@ -141,7 +141,7 @@ public class StaffController extends WebBaseController {
             }
         }
         //员工
-        Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag, wxEnterpriseId);
+        Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag, wxEnterpriseId,permitState,occupy);
 
         logger.info("pages={},totalPage={}", page.getCurrentPage(), page.getTotalPage());
         if(CollectionUtils.isNotEmpty(page.getResult())) {
@@ -466,7 +466,7 @@ public class StaffController extends WebBaseController {
      * @Description 会员导出
      */
     @RequestMapping("staff-export")
-    public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, Integer relationFlag, String keyWord, Integer permitState,BasePageInfo pageInfo) {
+    public HaobanResponse staffExport(HttpServletRequest request, HttpServletResponse response, String departmentId, Integer activeFlag, Integer relationFlag, String keyWord, String permitState,BasePageInfo pageInfo) {
         List<String> departmentIdSet = new ArrayList<>();
         departmentIdSet.add(departmentId);
         WebLoginDTO login = AuthWebRequestUtil.getLoginUser();
@@ -483,7 +483,7 @@ public class StaffController extends WebBaseController {
         int pageNum = 1;
         while (true) {
             pageInfo.setPageNum(pageNum);
-            Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag, wxEnterpriseId);
+            Page<StaffDTO> page = staffApiService.pageStaff(departmentIds, activeFlag, keyWord, pageInfo, relationFlag, wxEnterpriseId,permitState,null);
             List<StaffDTO> list = page.getResult();
             if (CollectionUtils.isEmpty(list)) {
                 break;