续期成员列表查询

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

+package com.gic.haoban.manage.api.dto.licence;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @Author: wenhua
+ * @Date: 2023/6/12 17:10
+ */
+public class RenewalUserDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * id
+     */
+    private Long renewalId;
+    /**
+     * 电话
+     */
+    private String phone;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 职位
+     */
+    private String postion;
+
+    public Long getRenewalId() {
+        return renewalId;
+    }
+
+    public void setRenewalId(Long renewalId) {
+        this.renewalId = renewalId;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPostion() {
+        return postion;
+    }
+
+    public void setPostion(String postion) {
+        this.postion = postion;
+    }
+}

haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/dto/qdto/licence/RenewalUserQDTO.java

+package com.gic.haoban.manage.api.dto.qdto.licence;
+
+import com.gic.api.base.commons.BasePageInfo;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @Author: wenhua
+ * @Date: 2023/6/12 17:08
+ */
+
+public class RenewalUserQDTO extends BasePageInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 员工姓名或手机号查询
+     */
+    private String searchParam;
+    /**
+     * wx企业Id
+     */
+    private String wxEnterpriseId;
+
+    public String getSearchParam() {
+        return searchParam;
+    }
+
+    public void setSearchParam(String searchParam) {
+        this.searchParam = searchParam;
+    }
+
+    public String getWxEnterpriseId() {
+        return wxEnterpriseId;
+    }
+
+    public void setWxEnterpriseId(String wxEnterpriseId) {
+        this.wxEnterpriseId = wxEnterpriseId;
+    }
+}

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

@@ -4,8 +4,10 @@ import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.haoban.manage.api.dto.licence.LicenceOrderDTO;
 import com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO;
+import com.gic.haoban.manage.api.dto.licence.RenewalUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderQDTO;
+import com.gic.haoban.manage.api.dto.qdto.licence.RenewalUserQDTO;
 
 import java.util.Date;
 import java.util.HashMap;
@@ -157,5 +159,7 @@ public interface LicenceOrderApiService {
      */
     ServiceResponse<Boolean> checkQywxOrderStatus(Long orderId);
 
+    ServiceResponse<Page<RenewalUserDTO>> getRenewalUserPage(RenewalUserQDTO qdto);
+
 
 }

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

 package com.gic.haoban.manage.service.dao.mapper;
 
+import com.gic.haoban.manage.api.dto.licence.RenewalUserDTO;
+import com.gic.haoban.manage.api.dto.qdto.licence.RenewalUserQDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanRenewalUser;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Pageable;
+
 import java.util.List;
 
 /**
@@ -25,7 +28,7 @@ public interface TabHaobanRenewalUserDao {
      * 查询指定行数据
      *
      * @param tabHaobanRenewalUser 查询条件
-     * @param pageable         分页对象
+     * @param pageable             分页对象
      * @return 对象列表
      */
     List<TabHaobanRenewalUser> queryAllByLimit(TabHaobanRenewalUser tabHaobanRenewalUser, @Param("pageable") Pageable pageable);
@@ -79,5 +82,13 @@ public interface TabHaobanRenewalUserDao {
      */
     int deleteById(Long renewalId);
 
+    /**
+     * 分页查询续期成员列表
+     *
+     * @param qdto
+     * @return
+     */
+    List<TabHaobanRenewalUser> getRenewalUserPage(RenewalUserQDTO qdto);
+
 }
 

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

 package com.gic.haoban.manage.service.service;
 
+import com.gic.api.base.commons.Page;
+import com.gic.haoban.manage.api.dto.licence.RenewalUserDTO;
+import com.gic.haoban.manage.api.dto.qdto.licence.RenewalUserQDTO;
 import com.gic.haoban.manage.service.entity.TabHaobanRenewalUser;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
 
 import java.util.List;
 
@@ -23,15 +24,6 @@ public interface TabHaobanRenewalUserService {
     TabHaobanRenewalUser queryById(Long renewalId);
 
     /**
-     * 分页查询
-     *
-     * @param tabHaobanRenewalUser 筛选条件
-     * @param pageRequest      分页对象
-     * @return 查询结果
-     */
-    Page<TabHaobanRenewalUser> queryByPage(TabHaobanRenewalUser tabHaobanRenewalUser, PageRequest pageRequest);
-
-    /**
      * 新增数据
      *
      * @param tabHaobanRenewalUser 实例对象
@@ -57,4 +49,12 @@ public interface TabHaobanRenewalUserService {
      */
     boolean deleteById(Long renewalId);
 
+    /**
+     * 分页查询续期成员列表
+     *
+     * @param qdto
+     * @return
+     */
+    Page<RenewalUserDTO> getRenewalUserPage(RenewalUserQDTO qdto);
+
 }

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

 package com.gic.haoban.manage.service.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import com.gic.haoban.manage.service.entity.TabHaobanRenewalUser;
+import com.gic.api.base.commons.Page;
+import com.gic.commons.util.PageHelperUtils;
+import com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO;
+import com.gic.haoban.manage.api.dto.licence.RenewalUserDTO;
+import com.gic.haoban.manage.api.dto.qdto.licence.RenewalUserQDTO;
 import com.gic.haoban.manage.service.dao.mapper.TabHaobanRenewalUserDao;
+import com.gic.haoban.manage.service.entity.TabHaobanRenewalUser;
+import com.gic.haoban.manage.service.entity.licence.TabHaobanLicenceOrder;
 import com.gic.haoban.manage.service.service.TabHaobanRenewalUserService;
+import com.github.pagehelper.PageHelper;
 import org.springframework.stereotype.Service;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageImpl;
-import org.springframework.data.domain.PageRequest;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -35,19 +39,6 @@ public class TabHaobanRenewalUserServiceImpl implements TabHaobanRenewalUserServ
     }
 
     /**
-     * 分页查询
-     *
-     * @param tabHaobanRenewalUser 筛选条件
-     * @param pageRequest      分页对象
-     * @return 查询结果
-     */
-    @Override
-    public Page<TabHaobanRenewalUser> queryByPage(TabHaobanRenewalUser tabHaobanRenewalUser, PageRequest pageRequest) {
-        long total = this.tabHaobanRenewalUserDao.count(tabHaobanRenewalUser);
-        return new PageImpl<>(this.tabHaobanRenewalUserDao.queryAllByLimit(tabHaobanRenewalUser, pageRequest), pageRequest, total);
-    }
-
-    /**
      * 新增数据
      *
      * @param tabHaobanRenewalUser 实例对象
@@ -61,7 +52,7 @@ public class TabHaobanRenewalUserServiceImpl implements TabHaobanRenewalUserServ
 
     @Override
     public void insertBatch(List<TabHaobanRenewalUser> tabHaobanRenewalUserList) {
-        if (CollUtil.isEmpty(tabHaobanRenewalUserList)){
+        if (CollUtil.isEmpty(tabHaobanRenewalUserList)) {
             return;
         }
         this.tabHaobanRenewalUserDao.insertBatch(tabHaobanRenewalUserList);
@@ -90,4 +81,11 @@ public class TabHaobanRenewalUserServiceImpl implements TabHaobanRenewalUserServ
     public boolean deleteById(Long renewalId) {
         return this.tabHaobanRenewalUserDao.deleteById(renewalId) > 0;
     }
+
+    @Override
+    public Page<RenewalUserDTO> getRenewalUserPage(RenewalUserQDTO qdto) {
+        PageHelper.startPage(qdto);
+        List<TabHaobanRenewalUser> page = tabHaobanRenewalUserDao.getRenewalUserPage(qdto);
+        return PageHelperUtils.changePageHelperToCurrentPage(page, RenewalUserDTO.class);
+    }
 }

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

@@ -15,12 +15,10 @@ import com.gic.enterprise.api.service.EnterpriseService;
 import com.gic.haoban.manage.api.dto.StaffActiveDataDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.WxEnterpriseQwDTO;
-import com.gic.haoban.manage.api.dto.licence.InvalidUserInfoDTO;
-import com.gic.haoban.manage.api.dto.licence.LicenceOrderDTO;
-import com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO;
-import com.gic.haoban.manage.api.dto.licence.LicenceOrderProgressDTO;
+import com.gic.haoban.manage.api.dto.licence.*;
 import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderQDTO;
+import com.gic.haoban.manage.api.dto.qdto.licence.RenewalUserQDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService;
 import com.gic.haoban.manage.service.config.Config;
@@ -703,4 +701,10 @@ public class LicenceOrderApiServiceImpl implements LicenceOrderApiService {
         return ServiceResponse.success();
     }
 
+    @Override
+    public ServiceResponse<Page<RenewalUserDTO>> getRenewalUserPage(RenewalUserQDTO qdto) {
+        Page<RenewalUserDTO> page = renewalUserService.getRenewalUserPage(qdto);
+        return ServiceResponse.success(page);
+    }
+
 }

haoban-manage3-service/src/main/resources/mapper/TabHaobanRenewalUserDao.xml

@@ -206,5 +206,19 @@
         delete from tab_haoban_renewal_user where renewal_id = #{renewalId}
     </delete>
 
+    <select id="getRenewalUserPage" resultMap="TabHaobanRenewalUserMap">
+        select
+        renewal_id, wx_enterprise_id, wx_user_id, order_id, phone, name, postion, invalid_flag, invalid_code, invalid_msg, update_time, create_time, delete_flag
+        from tab_haoban_renewal_user
+        <where>
+            <if test="searchParam != null">
+                and (phone like CONCAT('%',#{searchParam},'%') or name like CONCAT('%',#{searchParam},'%'))
+            </if>
+            <if test="wxEnterpriseId != null">
+                and wx_enterprise_id = #{wxEnterpriseId}
+            </if>
+        </where>
+    </select>
+
 </mapper>
 

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

@@ -17,8 +17,10 @@ import com.gic.haoban.common.utils.AuthWebRequestUtil;
 import com.gic.haoban.manage.api.dto.WxEnterpriseDTO;
 import com.gic.haoban.manage.api.dto.licence.LicenceOrderDTO;
 import com.gic.haoban.manage.api.dto.licence.LicenceOrderPageDTO;
+import com.gic.haoban.manage.api.dto.licence.RenewalUserDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderPageQDTO;
 import com.gic.haoban.manage.api.dto.qdto.licence.LicenceOrderQDTO;
+import com.gic.haoban.manage.api.dto.qdto.licence.RenewalUserQDTO;
 import com.gic.haoban.manage.api.service.WxEnterpriseApiService;
 import com.gic.haoban.manage.api.service.licence.LicenceOrderApiService;
 import com.gic.haoban.manage.web.config.Config;
@@ -26,8 +28,10 @@ import com.gic.haoban.manage.web.errCode.HaoBanErrCode;
 import com.gic.haoban.manage.web.log.LogRecordUserServiceImpl;
 import com.gic.haoban.manage.web.qo.licence.LicenceOrderPageQO;
 import com.gic.haoban.manage.web.qo.licence.LicenceOrderQO;
+import com.gic.haoban.manage.web.qo.licence.RenewalUserQO;
 import com.gic.haoban.manage.web.vo.licence.LicenceOrderPageVO;
 import com.gic.haoban.manage.web.vo.licence.LicenceOrderVO;
+import com.gic.haoban.manage.web.vo.licence.RenewalUserVO;
 import com.gic.log.record.anno.GicLogRecord;
 import com.gic.log.record.util.GicLogRecordCategoryEnum;
 import com.gic.log.record.util.GicLogRecordEvaluationContext;
@@ -374,6 +378,22 @@ public class LicenceOrderController {
         ServiceResponse<HashMap<String, Integer>> response = licenceOrderApiService.hasPopup(loginUser.getWxEnterpriseId());
         return RestResponse.successResult(response.getResult());
     }
+    /**
+     * 分页查询订单列表
+     */
+    @RequestMapping("renewal-user-page")
+    public RestResponse<Page<RenewalUserVO>> getRenewalUserPage(@RequestBody RenewalUserQO renewalUserQO) {
+        WebLoginDTO loginUser = AuthWebRequestUtil.getLoginUser();
+        if (loginUser == null || StringUtils.isBlank(loginUser.getEnterpriseId())) {
+            return RestResponse.failure(Convert.toStr(HaoBanErrCode.ERR_4.getCode()), HaoBanErrCode.ERR_4.getMsg());
+        }
+        String wxEnterpriseId = loginUser.getWxEnterpriseId();
+        RenewalUserQDTO qdto = JSONObject.parseObject(JSONObject.toJSONString(renewalUserQO), RenewalUserQDTO.class);
+        qdto.setWxEnterpriseId(wxEnterpriseId);
+        ServiceResponse<Page<RenewalUserDTO>> page = licenceOrderApiService.getRenewalUserPage(qdto);
+        Page<RenewalUserVO> voPage = PageHelperUtils.changePageToCurrentPage(page.getResult(), RenewalUserVO.class);
+        return RestResponse.successResult(voPage);
+    }
 
 
 }

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

+package com.gic.haoban.manage.web.qo.licence;
+
+import com.gic.api.base.commons.BasePageInfo;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @Author: wenhua
+ * @Date: 2023/6/12 17:08
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RenewalUserQO extends BasePageInfo implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 员工姓名或手机号查询
+     */
+    private String searchParam;
+}

haoban-manage3-web/src/main/java/com/gic/haoban/manage/web/vo/licence/RenewalUserVO.java

+package com.gic.haoban.manage.web.vo.licence;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * @description:
+ * @Author: wenhua
+ * @Date: 2023/6/12 17:10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class RenewalUserVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * id
+     */
+    private Long renewalId;
+    /**
+     * 电话
+     */
+    private String phone;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 职位
+     */
+    private String postion;
+}