Explorar el Código

20241213 付费码管理

lrj hace 9 meses
padre
commit
3eb842f544
Se han modificado 21 ficheros con 282 adiciones y 41 borrados
  1. 10 0
      PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/GetQiaoBiPersonDTO.java
  2. 2 0
      PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/QiaoBiVIPTypeVO.java
  3. 3 0
      PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/QiaoBiVipTypeDTO.java
  4. 0 12
      PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/UpdateTenantVipDTO.java
  5. 4 2
      PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/QiaoBiTenantVO.java
  6. 13 0
      PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/QueryQiaoBiTenantDTO.java
  7. 18 0
      PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/UpdateQiaoBiTenantDTO.java
  8. 9 0
      PCS/src/main/java/cn/cslg/permission/controller/PersonnelController.java
  9. 20 6
      PCS/src/main/java/cn/cslg/permission/controller/TenantController.java
  10. 3 0
      PCS/src/main/java/cn/cslg/permission/mapper/PersonnelMapper.java
  11. 4 0
      PCS/src/main/java/cn/cslg/permission/mapper/TenantMapper.java
  12. 1 1
      PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/AppVipTypeMapper.java
  13. 20 10
      PCS/src/main/java/cn/cslg/permission/service/PersonnelService.java
  14. 2 6
      PCS/src/main/java/cn/cslg/permission/service/qiaobi/AssoTenantVipTypeService.java
  15. 1 0
      PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiPersonService.java
  16. 76 0
      PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiTenantService.java
  17. 15 0
      PCS/src/main/resources/mapper/AppVipTypeMapper.xml
  18. 7 0
      PCS/src/main/resources/mapper/PersonnelMapper.xml
  19. 36 4
      PCS/src/main/resources/mapper/TenantMapper.xml
  20. 26 0
      PCS/src/test/java/cn/cslg/permission/qiaobi/QiaobiPersonTest.java
  21. 12 0
      PCS/src/test/java/cn/cslg/permission/qiaobi/QiaobiTenantTest.java

+ 10 - 0
PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/GetQiaoBiPersonDTO.java

@@ -0,0 +1,10 @@
+package cn.cslg.permission.common.model.qiaobi;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class GetQiaoBiPersonDTO {
+    private Date expitrTime;
+}

+ 2 - 0
PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/QiaoBiVIPTypeVO.java

@@ -6,4 +6,6 @@ import lombok.Data;
 public class QiaoBiVIPTypeVO {
     private Integer vipTypeId;
     private String vipTypeName;
+    private Integer vipTypeNum;
+    private Integer tenantId;
 }

+ 3 - 0
PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/QiaoBiVipTypeDTO.java

@@ -5,6 +5,8 @@ import io.swagger.v3.oas.models.security.SecurityScheme;
 import lombok.Data;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 
 @Data
 public class QiaoBiVipTypeDTO {
@@ -12,4 +14,5 @@ private String vipTypeName;
 private String appCode;
 private Integer tenantId;
 private String enterpriseCode;
+private List<Integer> tenantIds;
 }

+ 0 - 12
PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/UpdateTenantVipDTO.java

@@ -1,12 +0,0 @@
-package cn.cslg.permission.common.model.qiaobi;
-
-import cn.cslg.permission.common.model.qiaobi.paidCode.VipTypeNumDTO;
-import lombok.Data;
-
-import java.util.List;
-
-@Data
-public class UpdateTenantVipDTO {
-    private Integer tenantId;
-    private List<VipTypeNumDTO> vipTypes;
-}

+ 4 - 2
PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/QiaoBiTenantVO.java

@@ -1,7 +1,10 @@
 package cn.cslg.permission.common.model.qiaobi.tenant;
 
+import cn.cslg.permission.common.model.qiaobi.QiaoBiVIPTypeVO;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class QiaoBiTenantVO {
     private String address;
@@ -13,6 +16,5 @@ public class QiaoBiTenantVO {
     private Integer type;
     private String userName;
     private String email;
-
-
+   private List<QiaoBiVIPTypeVO> vipTypes;
 }

+ 13 - 0
PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/QueryQiaoBiTenantDTO.java

@@ -0,0 +1,13 @@
+package cn.cslg.permission.common.model.qiaobi.tenant;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class QueryQiaoBiTenantDTO {
+    private String name;
+    private List<Integer> ids;
+    private Long current;
+    private Long size;
+}

+ 18 - 0
PCS/src/main/java/cn/cslg/permission/common/model/qiaobi/tenant/UpdateQiaoBiTenantDTO.java

@@ -0,0 +1,18 @@
+package cn.cslg.permission.common.model.qiaobi.tenant;
+
+import cn.cslg.permission.common.model.qiaobi.paidCode.VipTypeNumDTO;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class UpdateQiaoBiTenantDTO {
+    private Integer tenantId;
+    private String name;
+    private String describe;
+    private String number;
+    private Integer state;
+    private String type;
+    private String address;
+    private List<VipTypeNumDTO> vipTypes;
+}

+ 9 - 0
PCS/src/main/java/cn/cslg/permission/controller/PersonnelController.java

@@ -2,6 +2,7 @@ package cn.cslg.permission.controller;
 
 import cn.cslg.permission.common.core.base.Constants;
 import cn.cslg.permission.common.model.personnel.UploadPersonnelConfigDTO;
+import cn.cslg.permission.common.model.qiaobi.GetQiaoBiPersonDTO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.common.utils.auth.checkAuth;
@@ -154,6 +155,14 @@ public class PersonnelController {
             return Response.error();
         }
     }
+    @PostMapping("/getExpirePersons")
+    @Operation(summary = "查询过期人员")
+    public String getExpirePersons(@RequestBody GetQiaoBiPersonDTO getQiaoBiPersonDTO) {
+        getQiaoBiPersonDTO=new GetQiaoBiPersonDTO();
+        List<PersonnelVO> personnelVOS = personnelService.getExpirePersons(getQiaoBiPersonDTO);
+            return Response.success(personnelVOS);
+
+    }
 
 
 }

+ 20 - 6
PCS/src/main/java/cn/cslg/permission/controller/TenantController.java

@@ -1,16 +1,17 @@
 package cn.cslg.permission.controller;
 
 import cn.cslg.permission.common.core.base.Constants;
-import cn.cslg.permission.common.model.qiaobi.UpdateTenantVipDTO;
+import cn.cslg.permission.common.model.Records;
+import cn.cslg.permission.common.model.qiaobi.tenant.UpdateQiaoBiTenantDTO;
+import cn.cslg.permission.common.model.qiaobi.tenant.QueryQiaoBiTenantDTO;
 import cn.cslg.permission.common.model.vo.TenantVO;
 import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.common.utils.auth.checkAuth;
 import cn.cslg.permission.domain.Invitation;
 import cn.cslg.permission.domain.Tenant;
-import cn.cslg.permission.domain.sys.SysDictItem;
 import cn.cslg.permission.exception.XiaoShiException;
 import cn.cslg.permission.service.TenantService;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import cn.cslg.permission.service.qiaobi.QiaoBiTenantService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -27,7 +28,7 @@ import java.util.List;
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class TenantController {
     private final TenantService tenantService;
-
+    private final QiaoBiTenantService qiaoBiTenantService;
     @checkAuth(FunId = "/admin/client/add")
     @PostMapping("/add")
     @Operation(summary = "新增租户")
@@ -119,8 +120,21 @@ public class TenantController {
 
     @Operation(summary = "更新租户vip")
     @PostMapping("/updateTenantVip")
-    public String updateTenantVip(@RequestBody UpdateTenantVipDTO updateTenantVipDTO) {
-        
+    public String updateTenantVip(@RequestBody UpdateQiaoBiTenantDTO updateTenantVipDTO) {
+
         return Response.success(tenantService.getAdminEmailPersons());
     }
+
+    @Operation(summary = "查询窍笔租户")
+    @PostMapping("/queryQiaoBiTenant")
+    public String queryQiaoBiTenant(@RequestBody QueryQiaoBiTenantDTO queryQiaoBiTenantDTO) {
+       Records records=qiaoBiTenantService.queryQiaoBiTenants(queryQiaoBiTenantDTO);
+        return Response.success(records);
+    }
+    @Operation(summary = "更新窍笔租户")
+    @PostMapping("/updateQiaoBiTenant")
+    public String updateQiaoBiTenant(@RequestBody UpdateQiaoBiTenantDTO updateQiaoBiTenantDTO) {
+      qiaoBiTenantService.updateQiaoBiTenant(updateQiaoBiTenantDTO);
+        return Response.success(true);
+    }
 }

+ 3 - 0
PCS/src/main/java/cn/cslg/permission/mapper/PersonnelMapper.java

@@ -1,7 +1,9 @@
 package cn.cslg.permission.mapper;
 
 import cn.cslg.permission.common.model.dto.PasUserDTO;
+import cn.cslg.permission.common.model.qiaobi.GetQiaoBiPersonDTO;
 import cn.cslg.permission.common.model.vo.PasUserVO;
+import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.domain.Personnel;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -20,4 +22,5 @@ import java.util.List;
 @Mapper
 public interface PersonnelMapper extends BaseMapper<Personnel> {
     IPage<PasUserVO> getPasUser(Page<PasUserVO> page, @Param("params") PasUserDTO params);
+     List<PersonnelVO>  getQiaoBiPersons(GetQiaoBiPersonDTO getQiaoBiPersonDTO);
 }

+ 4 - 0
PCS/src/main/java/cn/cslg/permission/mapper/TenantMapper.java

@@ -1,5 +1,7 @@
 package cn.cslg.permission.mapper;
 
+import cn.cslg.permission.common.model.qiaobi.tenant.QiaoBiTenantVO;
+import cn.cslg.permission.common.model.qiaobi.tenant.QueryQiaoBiTenantDTO;
 import cn.cslg.permission.common.model.vo.TenantVO;
 import org.springframework.stereotype.Repository;
 
@@ -61,4 +63,6 @@ public interface TenantMapper {
      */
     int updateByTenantVipType(Integer tenantVipType);
 
+    List<QiaoBiTenantVO> queryQiaoBiTenants(QueryQiaoBiTenantDTO queryQiaoBiTenantDTO);
+    Long queryQiaoBiTenantsTotal(QueryQiaoBiTenantDTO queryQiaoBiTenantDTO);
 }

+ 1 - 1
PCS/src/main/java/cn/cslg/permission/mapper/qiaobi/AppVipTypeMapper.java

@@ -22,7 +22,7 @@ public interface AppVipTypeMapper extends BaseMapper<AppVipType> {
     Long queryAppVipTypeTotal(QueryVipDTO queryVipDTO);
 
     public List<QiaoBiVIPTypeVO> qiaoBiTenantVIPTypeVOList(QiaoBiVipTypeDTO qiaoBiVipTypeDTO);
-
+    public List<QiaoBiVIPTypeVO> qiaoBiTenantsVIPTypeVOList(QiaoBiVipTypeDTO qiaoBiVipTypeDTO);
 }
 
 

+ 20 - 10
PCS/src/main/java/cn/cslg/permission/service/PersonnelService.java

@@ -4,6 +4,7 @@ import cn.cslg.permission.common.core.base.RedisConf;
 import cn.cslg.permission.common.core.business.LoginCacheKeyUtil;
 import cn.cslg.permission.common.model.dto.PhoneLoginDTO;
 import cn.cslg.permission.common.model.personnel.UploadPersonnelConfigDTO;
+import cn.cslg.permission.common.model.qiaobi.GetQiaoBiPersonDTO;
 import cn.cslg.permission.common.model.qiaobi.QiaoBiPersonSignUpDTO;
 import cn.cslg.permission.common.model.vo.*;
 import cn.cslg.permission.common.utils.*;
@@ -816,13 +817,13 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
     /**
      * 校验手机号是否存在
      */
-    public  void checkPhone(String phone){
-        LambdaQueryWrapper<Personnel> queryWrapper =new LambdaQueryWrapper<>();
-        queryWrapper.eq(Personnel::getPersonnelPhone,phone)
-                .eq(Personnel::getIsDelete,0);
-        Personnel personnel =this.getOne(queryWrapper,false);
-        if(personnel!=null){
-            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR,"该手机号已被使用");
+    public void checkPhone(String phone) {
+        LambdaQueryWrapper<Personnel> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(Personnel::getPersonnelPhone, phone)
+                .eq(Personnel::getIsDelete, 0);
+        Personnel personnel = this.getOne(queryWrapper, false);
+        if (personnel != null) {
+            throw new XiaoShiException(ExceptionEnum.BUSINESS_ERROR, "该手机号已被使用");
         }
     }
 
@@ -840,9 +841,9 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
             personnelVO.setName("");
         }
         queryWrapper.and((wrapper) -> wrapper.like(Personnel::getPersonnelName, personnelVO.getName())
-                        .or()
-                        .like(Personnel::getPersonnelDescription, personnelVO.getName())
-                );
+                .or()
+                .like(Personnel::getPersonnelDescription, personnelVO.getName())
+        );
         //根据人员id查询
         if (personnelVO.getId() != null) {
             queryWrapper.in(Personnel::getId, Integer.parseInt(personnelVO.getId()));
@@ -964,4 +965,13 @@ public class PersonnelService extends ServiceImpl<PersonnelMapper, Personnel> {
             return false;
         }
     }
+
+    public List<PersonnelVO> getExpirePersons(GetQiaoBiPersonDTO getQiaoBiPersonDTO) {
+        Date date = new Date();
+        Date expireTime = DateUtils.getPlusMonthDate(date, 1);
+        getQiaoBiPersonDTO.setExpitrTime(expireTime);
+        List<PersonnelVO> personnelList = this.getBaseMapper().getQiaoBiPersons(getQiaoBiPersonDTO);
+
+        return personnelList;
+    }
 }

+ 2 - 6
PCS/src/main/java/cn/cslg/permission/service/qiaobi/AssoTenantVipTypeService.java

@@ -1,7 +1,8 @@
 package cn.cslg.permission.service.qiaobi;
 
-import cn.cslg.permission.common.model.qiaobi.UpdateTenantVipDTO;
+import cn.cslg.permission.common.model.qiaobi.tenant.UpdateQiaoBiTenantDTO;
 import cn.cslg.permission.common.model.qiaobi.paidCode.VipTypeNumDTO;
+import cn.cslg.permission.domain.Tenant;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import cn.cslg.permission.domain.qiaobi.AssoTenantVipType;
@@ -22,11 +23,6 @@ import java.util.stream.Collectors;
 @Service
 public class AssoTenantVipTypeService extends ServiceImpl<AssoTenantVipTypeMapper, AssoTenantVipType> {
 
-    public void updateTenantVipType(UpdateTenantVipDTO updateTenantVipDTO) {
-        Integer tenantId = updateTenantVipDTO.getTenantId();
-        List<VipTypeNumDTO> vipTypeNumDTOS = updateTenantVipDTO.getVipTypes();
-
-    }
 
     @Transactional(rollbackFor = Exception.class)
     public void saveFunctionModuleBatch(List<VipTypeNumDTO> vipTypeNumDTOS, Integer tenantId) {

+ 1 - 0
PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiPersonService.java

@@ -197,5 +197,6 @@ public class QiaoBiPersonService {
         businessTask.setStatus(0);
         businessTask.setTenantId(tenantId);
         businessTask.insert();
+
     }
 }

+ 76 - 0
PCS/src/main/java/cn/cslg/permission/service/qiaobi/QiaoBiTenantService.java

@@ -0,0 +1,76 @@
+package cn.cslg.permission.service.qiaobi;
+
+import cn.cslg.permission.common.model.Records;
+import cn.cslg.permission.common.model.qiaobi.QiaoBiVIPTypeVO;
+import cn.cslg.permission.common.model.qiaobi.QiaoBiVipTypeDTO;
+import cn.cslg.permission.common.model.qiaobi.paidCode.VipTypeNumDTO;
+import cn.cslg.permission.common.model.qiaobi.tenant.QiaoBiTenantVO;
+import cn.cslg.permission.common.model.qiaobi.tenant.QueryQiaoBiTenantDTO;
+import cn.cslg.permission.common.model.qiaobi.tenant.UpdateQiaoBiTenantDTO;
+import cn.cslg.permission.domain.Tenant;
+import cn.cslg.permission.mapper.TenantMapper;
+import cn.cslg.permission.mapper.qiaobi.AppVipTypeMapper;
+import cn.cslg.permission.service.TenantService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@RequiredArgsConstructor
+public class QiaoBiTenantService {
+    private final TenantMapper tenantMapper;
+    private final AppVipTypeMapper appVipTypeMapper;
+    private final TenantService tenantService;
+    private final AssoTenantVipTypeService assoTenantVipTypeService;
+    public Records queryQiaoBiTenants(QueryQiaoBiTenantDTO queryQiaoBiTenantDTO) {
+        Long current = queryQiaoBiTenantDTO.getCurrent();
+        Long size = queryQiaoBiTenantDTO.getSize();
+        if (current != null && size != null) {
+            queryQiaoBiTenantDTO.setCurrent(((current - 1) * size));
+        }
+        List<QiaoBiTenantVO> qiaoBiTenantVOS = tenantMapper.queryQiaoBiTenants(queryQiaoBiTenantDTO);
+        this.loadQiaoBiTenantVO(qiaoBiTenantVOS);
+        Long total = tenantMapper.queryQiaoBiTenantsTotal(queryQiaoBiTenantDTO);
+        Records records = new Records();
+        records.setSize(size);
+        records.setCurrent(current);
+        records.setTotal(total);
+        records.setRecords(qiaoBiTenantVOS);
+        return records;
+    }
+
+
+    private void loadQiaoBiTenantVO(List<QiaoBiTenantVO> qiaoBiTenantVOS) {
+        if (qiaoBiTenantVOS == null || qiaoBiTenantVOS.size() == 0) {
+            return;
+        }
+        List<Integer> tenantIds = qiaoBiTenantVOS.stream().map(QiaoBiTenantVO::getId).collect(Collectors.toList());
+
+        QiaoBiVipTypeDTO qiaoBiVipTypeDTO = new QiaoBiVipTypeDTO();
+        qiaoBiVipTypeDTO.setTenantIds(tenantIds);
+        List<QiaoBiVIPTypeVO> qiaoBiVIPTypeVOList = appVipTypeMapper.qiaoBiTenantsVIPTypeVOList(qiaoBiVipTypeDTO);
+        for (QiaoBiTenantVO qiaoBiTenantVO : qiaoBiTenantVOS) {
+            List<QiaoBiVIPTypeVO> temVOs = qiaoBiVIPTypeVOList.stream().filter(item -> item.getTenantId().equals(qiaoBiTenantVO.getId())).collect(Collectors.toList());
+            qiaoBiTenantVO.setVipTypes(temVOs);
+        }
+
+    }
+
+
+
+    public void updateQiaoBiTenant(UpdateQiaoBiTenantDTO updateQiaoBiTenantDTO) {
+        Integer tenantId = updateQiaoBiTenantDTO.getTenantId();
+        Tenant tenant = tenantService.getById(tenantId);
+        tenant.setTenantName(updateQiaoBiTenantDTO.getName());
+        tenant.setTenantStatus(updateQiaoBiTenantDTO.getState());
+        tenant.setTenantAddress(updateQiaoBiTenantDTO.getAddress());
+        tenant.setTenantType(updateQiaoBiTenantDTO.getType());
+        tenant.setTenantDescription(updateQiaoBiTenantDTO.getDescribe());
+        tenant.updateById();
+        List<VipTypeNumDTO> vipTypeNumDTOS = updateQiaoBiTenantDTO.getVipTypes();
+        assoTenantVipTypeService.saveFunctionModuleBatch(vipTypeNumDTOS,tenantId);
+    }
+
+}

+ 15 - 0
PCS/src/main/resources/mapper/AppVipTypeMapper.xml

@@ -100,4 +100,19 @@
 
         </where>
     </select>
+
+    <select id="qiaoBiTenantsVIPTypeVOList" resultType="cn.cslg.permission.common.model.qiaobi.QiaoBiVIPTypeVO">
+        select vip.ID as vipTypeId,vip.TENANT_VIP_NAME as vipTypeName ,app.VIP_TYPE_NUM as vipTypeNum ,app.TENANT_ID as tenantId  from ASSO_TENANT_VIP_TYPE as app left join TENANT_VIP_TYPE
+        as vip on
+        app.VIP_TYPE_ID = vip.ID
+        <where>
+        <if test="tenantIds!=null and tenantIds.size()>0">
+            app.TENANT_ID  in (
+            <foreach collection="tenantIds" item="n" separator=",">
+                #{n}
+            </foreach>
+            )
+        </if>
+        </where>
+    </select>
 </mapper>

+ 7 - 0
PCS/src/main/resources/mapper/PersonnelMapper.xml

@@ -21,4 +21,11 @@ select id ,PERSONNEL_NAME as name,PERSONNEL_USERNAME as username from PERSONNEL
 </where>
   </select>
 
+
+    <select id="getQiaoBiPersons" resultType="cn.cslg.permission.common.model.vo.PersonnelVO">
+        select p.ID as id ,PERSONNEL_NAME as name,PERSONNEL_USERNAME as username,apvt.EXPITR_TIME as expitrTime from PERSONNEL as p left join ASSO_PERSON_VIP_TYPE as apvt
+        <where>
+            apvt.EXPITR_TIME> #{expitrTime}
+        </where>
+    </select>
 </mapper>

+ 36 - 4
PCS/src/main/resources/mapper/TenantMapper.xml

@@ -90,21 +90,53 @@
     </update>
 
 
-    <select id="queryQiaoBiTenants" resultType="int">
+    <select id="queryQiaoBiTenants" resultType="cn.cslg.permission.common.model.qiaobi.tenant.QiaoBiTenantVO">
         select t.TENANT_NAME as name,
                t.TENANT_DESCRIPTION as 'describe',
         t.ID as id,
-               t.TENANT_CONTACT_NUMBER as number,
+               t.TENANT_QUOTA as number,
                t.TENANT_STATUS as state,
                t.TENANT_TYPE as type,
+               t.TENANT_ADDRESS as address,
                p.PERSONNEL_NAME as userName,
                p.PERSONNEL_EMAIL as email
         from TENANT t
       left join PERSONNEL p on t.PERSONNEL_ID=p.ID
 <where>
-    <if test="tenantId!=null">
-        t.ID=#{tenantId}
+    <if test="ids!=null and ids.size()>0">
+      and  t.ID  in (
+        <foreach collection="ids" item="n" separator=",">
+            #{n}
+        </foreach>
+        )
+    </if>
+    <if test="name!=null and !name.trim().equals('')">
+    and    t.TENANT_NAME like concat('%', #{vipTypeName}, '%')
     </if>
 </where>
+        order by t.CREATE_TIME desc
+        <if test="current!=null and size!=null">
+            limit #{current},#{size}
+        </if>
+    </select>
+
+
+    <select id="queryQiaoBiTenantsTotal" resultType="java.lang.Long">
+        select count(*)
+        from TENANT t
+        left join PERSONNEL p on t.PERSONNEL_ID=p.ID
+        <where>
+            <if test="ids!=null and ids.size()>0">
+                and  t.ID  in (
+                <foreach collection="ids" item="n" separator=",">
+                    #{n}
+                </foreach>
+                )
+            </if>
+            <if test="name!=null and !name.trim().equals('')">
+                and    t.TENANT_NAME like concat('%', #{vipTypeName}, '%')
+            </if>
+        </where>
+
     </select>
 </mapper>

+ 26 - 0
PCS/src/test/java/cn/cslg/permission/qiaobi/QiaobiPersonTest.java

@@ -0,0 +1,26 @@
+package cn.cslg.permission.qiaobi;
+
+import cn.cslg.permission.common.model.qiaobi.tenant.CompanyPersonSignUpDTO;
+import cn.cslg.permission.service.qiaobi.QiaoBiPersonService;
+import lombok.RequiredArgsConstructor;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+@RequiredArgsConstructor
+public class QiaobiPersonTest {
+private final QiaoBiPersonService qiaoBiPersonService;
+@Test
+public void CompanyPersonSignUp(){
+    CompanyPersonSignUpDTO companyPersonSignUpDTO =new CompanyPersonSignUpDTO();
+    companyPersonSignUpDTO.setPersonnelEmail("2232623707@qq.com");
+    companyPersonSignUpDTO.setPersonnelPhone("17625547167");
+    qiaoBiPersonService.companyPersonSignUp(companyPersonSignUpDTO);
+
+
+}
+}

+ 12 - 0
PCS/src/test/java/cn/cslg/permission/qiaobi/QiaobiTenantTest.java

@@ -0,0 +1,12 @@
+package cn.cslg.permission.qiaobi;
+
+import org.junit.runner.RunWith;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+
+@SpringBootTest
+@RunWith(SpringRunner.class)
+public class QiaobiTenantTest {
+
+
+}