2/21

PCS/src/main/java/cn/cslg/permission/common/model/dto/PageDTO2.java

@@ -4,6 +4,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 分页查询前端传输DTO类
@@ -23,8 +24,19 @@ public class PageDTO2 implements Serializable {
      */
     private Integer pageSize;
     /**
-     * 检索条件
+     * 模糊查询检索条件
      */
     private String likeName;
-
+    /**
+     * 会员类型名称排序
+     */
+    private Integer tenantVipName;
+    /**
+     * 创建人排序
+     */
+    private Integer createPersonName;
+    /**
+     * 创建时间排序
+     */
+    private Integer createTime;
 }

PCS/src/main/java/cn/cslg/permission/mapper/TenantVipTypeMapper.java

@@ -1,5 +1,6 @@
 package cn.cslg.permission.mapper;
 
+import cn.cslg.permission.common.model.dto.PageDTO2;
 import cn.cslg.permission.common.model.vo.AssoTenantVipTypeAndFunctionVO;
 import cn.cslg.permission.common.model.vo.TenantVipTypeFunctionVO;
 import cn.cslg.permission.domain.TenantVipType;
@@ -36,7 +37,7 @@ public interface TenantVipTypeMapper {
      *
      * @return 返回查询到的列表
      */
-    List<TenantVipTypeFunctionVO> queryTenantVipType(String likeName);
+    List<TenantVipTypeFunctionVO> queryTenantVipType(PageDTO2 pageDTO2);
 
     /**
      * 根据id修改数据

PCS/src/main/java/cn/cslg/permission/service/TenantService.java

@@ -287,6 +287,7 @@ public class TenantService extends ServiceImpl<TenantEntityMapper, Tenant> {
                     .setNumber(tenant.getTenantQuota())
                     .setState(tenant.getTenantStatus())
                     .setType(tenant.getTenantType())
+                    .setTenantVipType(tenant.getTenantVipType())
                     .setUsername(personnelService.getById(tenant.getPersonnelId()).getPersonnelUserName())
                     .setPersonnelId(tenant.getPersonnelId())
                     .setFunction(lst)

PCS/src/main/java/cn/cslg/permission/service/impl/TenantVipTypeService.java

@@ -112,12 +112,13 @@ public class TenantVipTypeService implements ITenantVipTypeService {
         //模糊查询参数条件
         if (likeName != null) {
             likeName = "%" + likeName + "%";
+            pageDTO2.setLikeName(likeName);
         }
         //分页查询(若前端有传当前页和每页条数)
         if (page != null && pageSize != null) {
             PageHelper.startPage(page, pageSize);
         }
-        List<TenantVipTypeFunctionVO> queryResults = tenantVipTypeMapper.queryTenantVipType(likeName);
+        List<TenantVipTypeFunctionVO> queryResults = tenantVipTypeMapper.queryTenantVipType(pageDTO2);
 
         //遍历租户会员类型，取出每个会员类型中的功能ID、功能组件树路径、功能名称、功能描述集合
         for (TenantVipTypeFunctionVO tenantVipTypeFunctionVO : queryResults) {

PCS/src/main/resources/mapper/TenantVipTypeMapper.xml

@@ -20,21 +20,44 @@
     </select>
 
     <!--分页查询租户会员类型和功能(一对多关联查询 -> mybatis父子查询)-->
-    <!--List<TenantVipTypeFunctionVO> queryTenantVipType(String likeName);-->
+    <!--List<TenantVipTypeFunctionVO> queryTenantVipType(PageDTO2 pageDTO2);-->
     <select id="queryTenantVipType" resultMap="queryTenantVipTypeMap">
         select ID VIP_ID,
-               TENANT_VIP_NAME,
-               REMARK,
-               CREATE_PERSON_ID,
-               CREATE_PERSON_NAME,
-               CREATE_TIME
+        TENANT_VIP_NAME,
+        REMARK,
+        CREATE_PERSON_ID,
+        CREATE_PERSON_NAME,
+        CREATE_TIME
         from TENANT_VIP_TYPE
         <where>
             <if test="likeName != null">
                 TENANT_VIP_NAME like #{likeName} or CREATE_PERSON_NAME like #{likeName}
             </if>
         </where>
-        order by ID
+        order by
+        <choose>
+            <when test="tenantVipName == 1">
+                TENANT_VIP_NAME
+            </when>
+            <when test="tenantVipName == 0">
+                TENANT_VIP_NAME desc
+            </when>
+            <when test="createPersonName == 1">
+                CREATE_PERSON_NAME
+            </when>
+            <when test="createPersonName == 0">
+                CREATE_PERSON_NAME desc
+            </when>
+            <when test="createTime == 1">
+                CREATE_TIME
+            </when>
+            <when test="createTime == 0">
+                CREATE_TIME desc
+            </when>
+            <otherwise>
+                ID
+            </otherwise>
+        </choose>
     </select>
 
     <resultMap id="queryTenantVipTypeMap" type="cn.cslg.permission.common.model.vo.TenantVipTypeFunctionVO">