1.添加学生、老师解绑申请列表接口

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/entity/TenantUnbindRecord.java

@@ -22,48 +22,52 @@ import java.util.Date;
 @TableName("tenant_unbind_record")
 public class TenantUnbindRecord implements Serializable {
 
-    @ApiModelProperty("主键ID") 
-	    @TableId(value = "id_")
-	    private Long id;
+    @ApiModelProperty("主键ID")
+    @TableId(value = "id_")
+    private Long id;
 
-    @ApiModelProperty("机构ID") 
-	@TableField(value = "tenant_id_")
+    @ApiModelProperty("机构ID")
+    @TableField(value = "tenant_id_")
     private Long tenantId;
 
-    @ApiModelProperty("用户ID") 
-	@TableField(value = "user_id_")
+    @ApiModelProperty("用户ID")
+    @TableField(value = "user_id_")
     private Long userId;
 
-    @ApiModelProperty("用户类型") 
-	@TableField(value = "user_type_")
+    @ApiModelProperty("手机号")
+    @TableField(value = "phone_")
+    private String phone;
+
+    @ApiModelProperty("用户类型")
+    @TableField(value = "user_type_")
     private String userType;
 
-    @ApiModelProperty("解绑理由") 
-	@TableField(value = "unbind_reason_")
+    @ApiModelProperty("解绑理由")
+    @TableField(value = "unbind_reason_")
     private String unbindReason;
 
-    @ApiModelProperty("审核状态 DOING、审核中 PASS、通过 UNPASS、不通过") 
-	@TableField(value = "status_")
+    @ApiModelProperty("审核状态 DOING、审核中 PASS、通过 UNPASS、不通过")
+    @TableField(value = "status_")
     private String status;
 
-    @ApiModelProperty("审核人") 
-	@TableField(value = "verify_user_id_")
+    @ApiModelProperty("审核人")
+    @TableField(value = "verify_user_id_")
     private Long verifyUserId;
 
-    @ApiModelProperty("审核理由") 
-	@TableField(value = "reason_")
+    @ApiModelProperty("审核理由")
+    @TableField(value = "reason_")
     private String reason;
 
-    @ApiModelProperty("后台介入时间") 
-	@TableField(value = "intervene_time_")
+    @ApiModelProperty("后台介入时间")
+    @TableField(value = "intervene_time_")
     private Date interveneTime;
 
-    @ApiModelProperty("更新时间") 
-	@TableField(value = "update_time_")
+    @ApiModelProperty("更新时间")
+    @TableField(value = "update_time_")
     private Date updateTime;
 
-    @ApiModelProperty("创建时间") 
-	@TableField(value = "create_time_")
+    @ApiModelProperty("创建时间")
+    @TableField(value = "create_time_")
     private Date createTime;
 
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantUnbindRecordMapper.java

@@ -16,12 +16,14 @@ import com.yonge.cooleshow.biz.dal.wrapper.TenantUnbindRecordWrapper;
 @Repository
 public interface TenantUnbindRecordMapper extends BaseMapper<TenantUnbindRecord> {
 
-	/**
-	 * 分页查询
-	 * @param page IPage<TenantUnbindRecordWrapper.TenantUnbindRecord>
-	 * @param param TenantUnbindRecordWrapper.TenantUnbindRecordQuery
-	 * @return List<TenantUnbindRecordWrapper.TenantUnbindRecord>
-	 */
-	List<TenantUnbindRecord> selectPage(@Param("page") IPage<TenantUnbindRecord> page, @Param("param") TenantUnbindRecordWrapper.TenantUnbindRecordQuery param);
-	
+    /**
+     * 分页查询
+     *
+     * @param page  IPage<TenantUnbindRecordWrapper.TenantUnbindRecord>
+     * @param param TenantUnbindRecordWrapper.TenantUnbindRecordQuery
+     * @return List<TenantUnbindRecordWrapper.TenantUnbindRecord>
+     */
+    List<TenantUnbindRecordWrapper.TenantUnbindRecord> selectPage(@Param("page") IPage<TenantUnbindRecordWrapper.TenantUnbindRecord> page,
+                                                                  @Param("param") TenantUnbindRecordWrapper.TenantUnbindRecordQuery param);
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/TenantUnbindRecordService.java

@@ -9,35 +9,40 @@ import com.yonge.cooleshow.biz.dal.entity.TenantUnbindRecord;
  * 机构解绑申请记录
  * 2023-07-21 17:32:49
  */
-public interface TenantUnbindRecordService extends IService<TenantUnbindRecord>  {
+public interface TenantUnbindRecordService extends IService<TenantUnbindRecord> {
 
-	/**
+    /**
      * 查询详情
+     *
      * @param id 详情ID
      * @return TenantUnbindRecord
      */
-	TenantUnbindRecord detail(Long id);
+    TenantUnbindRecord detail(Long id);
 
     /**
      * 分页查询
-     * @param page IPage<TenantUnbindRecord>
+     *
+     * @param page  IPage<TenantUnbindRecord>
      * @param query TenantUnbindRecordWrapper.TenantUnbindRecordQuery
      * @return IPage<TenantUnbindRecord>
      */
-    IPage<TenantUnbindRecord> selectPage(IPage<TenantUnbindRecord> page, TenantUnbindRecordWrapper.TenantUnbindRecordQuery query);
-	
+    IPage<TenantUnbindRecordWrapper.TenantUnbindRecord> selectPage(IPage<TenantUnbindRecordWrapper.TenantUnbindRecord> page,
+                                                                   TenantUnbindRecordWrapper.TenantUnbindRecordQuery query);
+
     /**
      * 添加
+     *
      * @param tenantUnbindRecord TenantUnbindRecordWrapper.TenantUnbindRecord
      * @return Boolean
      */
-     Boolean add(TenantUnbindRecordWrapper.TenantUnbindRecord tenantUnbindRecord);   
+    Boolean add(TenantUnbindRecordWrapper.TenantUnbindRecord tenantUnbindRecord);
 
     /**
      * 更新
+     *
      * @param tenantUnbindRecord TenantUnbindRecordWrapper.TenantUnbindRecord
      * @return Boolean
      */
-     Boolean update(TenantUnbindRecordWrapper.TenantUnbindRecord tenantUnbindRecord);
-     
+    Boolean update(TenantUnbindRecordWrapper.TenantUnbindRecord tenantUnbindRecord);
+
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantUnbindRecordServiceImpl.java

@@ -37,7 +37,7 @@ public class TenantUnbindRecordServiceImpl extends ServiceImpl<TenantUnbindRecor
      * @return IPage<TenantUnbindRecord>
      */
     @Override
-    public IPage<TenantUnbindRecord> selectPage(IPage<TenantUnbindRecord> page, TenantUnbindRecordWrapper.TenantUnbindRecordQuery query) {
+    public IPage<TenantUnbindRecordWrapper.TenantUnbindRecord> selectPage(IPage<TenantUnbindRecordWrapper.TenantUnbindRecord> page, TenantUnbindRecordWrapper.TenantUnbindRecordQuery query) {
         
         return page.setRecords(baseMapper.selectPage(page, query));
     }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantUnbindRecordWrapper.java

@@ -4,14 +4,15 @@ import com.alibaba.fastjson.JSON;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-import java.util.Optional;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 
+import java.util.Date;
+import java.util.Optional;
+
 /**
  * 机构解绑申请记录
  * 2023-07-21 17:32:49
@@ -20,25 +21,37 @@ import org.apache.commons.lang3.StringUtils;
 public class TenantUnbindRecordWrapper {
 
     @Data
-	@Builder
+    @Builder
     @NoArgsConstructor
     @AllArgsConstructor
     @ApiModel(" TenantUnbindRecordQuery-机构解绑申请记录")
     public static class TenantUnbindRecordQuery implements QueryInfo {
-    
-    	@ApiModelProperty("当前页")
+
+        @ApiModelProperty("当前页")
         private Integer page;
-        
+
         @ApiModelProperty("分页行数")
         private Integer rows;
-        
+
         @ApiModelProperty("关键字匹配")
-		private String keyword;
-        
+        private String keyword;
+
+        @ApiModelProperty("省份")
+        private String provinceCode;
+
+        @ApiModelProperty("城市")
+        private String cityCode;
+
+        @ApiModelProperty("区域")
+        private String regionCode;
+
+        @ApiModelProperty("用户类型，TEACHER/STUDENT")
+        private String userType;
+
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
         }
-        
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }
@@ -46,11 +59,82 @@ public class TenantUnbindRecordWrapper {
         public static TenantUnbindRecordQuery from(String json) {
             return JSON.parseObject(json, TenantUnbindRecordQuery.class);
         }
-    }  
+    }
 
-	@ApiModel(" TenantUnbindRecord-机构解绑申请记录")
+    @Data
+    @Builder
+    @NoArgsConstructor
+    @AllArgsConstructor
+    @ApiModel(" TenantUnbindRecord-机构解绑申请记录")
     public static class TenantUnbindRecord {
-        
+
+        @ApiModelProperty("主键ID")
+        private Long id;
+
+        @ApiModelProperty("机构ID")
+        private Long tenantId;
+
+        @ApiModelProperty("机构名称")
+        private String tenantName;
+
+        @ApiModelProperty("机构联系人")
+        private String tenantUserName;
+
+        @ApiModelProperty("机构人手机号")
+        private String tenantUserPhone;
+
+        @ApiModelProperty("省码")
+        private Integer provinceCode;
+
+        @ApiModelProperty("市码")
+        private Integer cityCode;
+
+        @ApiModelProperty("区码")
+        private Integer regionCode;
+
+        @ApiModelProperty("省")
+        private String provinceName;
+
+        @ApiModelProperty("市")
+        private String cityName;
+
+        @ApiModelProperty("区")
+        private String regionName;
+
+        @ApiModelProperty("用户ID")
+        private Long userId;
+
+        @ApiModelProperty("申请人姓名")
+        private String userName;
+
+        @ApiModelProperty("手机号")
+        private String phone;
+
+        @ApiModelProperty("用户类型")
+        private String userType;
+
+        @ApiModelProperty("解绑理由")
+        private String unbindReason;
+
+        @ApiModelProperty("审核状态 DOING、审核中 PASS、通过 UNPASS、不通过")
+        private String status;
+
+        @ApiModelProperty("审核人")
+        private Long verifyUserId;
+
+        @ApiModelProperty("审核理由")
+        private String reason;
+
+        @ApiModelProperty("后台介入时间")
+        private Date interveneTime;
+
+        @ApiModelProperty("更新时间")
+        private Date updateTime;
+
+        @ApiModelProperty("创建时间")
+        private Date createTime;
+
+
         public String jsonString() {
             return JSON.toJSONString(this);
         }
@@ -58,6 +142,6 @@ public class TenantUnbindRecordWrapper {
         public static TenantUnbindRecord from(String json) {
             return JSON.parseObject(json, TenantUnbindRecord.class);
         }
-	}
+    }
 
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantUnbindRecordMapper.xml

@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE  mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.yonge.cooleshow.biz.dal.mapper.TenantUnbindRecordMapper">
-
-	 
-    
     <!-- 表字段 -->
     <sql id="baseColumns">
-         t.id_ AS id
+        t.id_ AS id
         , t.tenant_id_ AS tenantId
         , t.user_id_ AS userId
+        , t.phone_ AS phone
         , t.user_type_ AS userType
         , t.unbind_reason_ AS unbindReason
         , t.status_ AS status
@@ -17,12 +15,44 @@
         , t.intervene_time_ AS interveneTime
         , t.update_time_ AS updateTime
         , t.create_time_ AS createTime
-        </sql> 
-    
-    <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.entity.TenantUnbindRecord">
-		SELECT         
-        	<include refid="baseColumns" />
-		FROM tenant_unbind_record t
-	</select>
-    
+    </sql>
+
+    <select id="selectPage"
+            resultType="com.yonge.cooleshow.biz.dal.wrapper.TenantUnbindRecordWrapper$TenantUnbindRecord">
+        SELECT
+        <include refid="baseColumns"/>
+        ,ti.province_code_ as provinceCode
+        ,ti.city_code_ as cityCide
+        ,ti.region_code_ as regionCide
+        ,ti.username_ as tenantUserName
+        ,ti.phone_ as tenantUserPhone
+        ,su.username_ as userName
+        FROM tenant_unbind_record t
+        LEFT JOIN tenant_info ti ON ti.id_ = t.tenant_id_
+        LEFT JOIN sys_user su on su.id_ = t.user_id_
+        <where>
+            <if test="param.keyword != null">
+                AND (
+                ti.name_ like concat ('%',#{param2.keyword},'%') or
+                ti.username_ like concat ('%',#{param2.keyword},'%') or
+                ti.phone_ like concat ('%',#{param2.keyword},'%') or
+                su.username_ like concat ('%',#{param2.keyword},'%') or
+                su.phone_ like concat ('%',#{param2.keyword},'%')
+                )
+            </if>
+            <if test="param.userType != null">
+                AND t.user_type_ = #{param.userType}
+            </if>
+            <if test="param.provinceCode != null">
+                AND ti.province_code_ = #{param.provinceCode}
+            </if>
+            <if test="param.cityCode != null">
+                AND ti.city_code_ = #{param.cityCode}
+            </if>
+            <if test="param.regionCode != null">
+                AND ti.region_code_ = #{param.regionCode}
+            </if>
+        </where>
+        order by t.id_ desc
+    </select>
 </mapper>