代码提交

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

@@ -1,9 +1,13 @@
 package com.yonge.cooleshow.biz.dal.wrapper;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.yonge.cooleshow.biz.dal.enums.AuthStatusEnum;
 import com.yonge.toolset.base.page.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+
+import java.util.Date;
 import java.util.Optional;
 
 import lombok.AllArgsConstructor;
@@ -26,7 +30,7 @@ public class TenantInfoWrapper {
     @ApiModel(" TenantInfoQuery-机构表")
     public static class TenantInfoQuery  extends QueryInfo {
         @ApiModelProperty("id")
-        private Integer id;
+        private long id;
 
         @ApiModelProperty("是否冻结")
         private Integer ifFreeze;
@@ -52,6 +56,9 @@ public class TenantInfoWrapper {
         @ApiModelProperty("地区街道编码")
         private Integer regionCode;
 
+        @ApiModelProperty("审核是否通过")
+        private Integer ifPass;
+
         
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);
@@ -74,7 +81,10 @@ public class TenantInfoWrapper {
     @ApiModel(" TenantInfo-机构表分页响应")
     public static class TenantInfo {
         @ApiModelProperty("id")
-        private Integer id;
+        private long id;
+
+        @ApiModelProperty("机构ID")
+        private Long tenantId;
 
         @ApiModelProperty("机构名称")
         private String name;
@@ -85,8 +95,8 @@ public class TenantInfoWrapper {
         @ApiModelProperty("简介")
         private String briefIntroduction;
 
-        @ApiModelProperty("所属地区")
-        private String area;
+        /*@ApiModelProperty("所属地区")
+        private String area;*/
 
         @ApiModelProperty("联系人")
         private String userName;
@@ -118,13 +128,24 @@ public class TenantInfoWrapper {
         @ApiModelProperty("地区街道名称")
         private String regionName;
 
-        @ApiModelProperty("当前页")
-        private int page;
+        @ApiModelProperty("审核状态 DOING、审核中 PASS、通过 UNPASS、不通过")
+        @TableField(value = "status_")
+        private AuthStatusEnum status;
 
-        @ApiModelProperty("分页行数")
-        private int rows;
+        @ApiModelProperty("机构入驻申请记录")
+        private Long tenantApplyRecordId;
+
+        @ApiModelProperty("审核人")
+        private Long verifyUserId;
+
+        @ApiModelProperty("审核理由")
+        private String reason;
 
+        @ApiModelProperty("审核时间")
+        private Date createTime;
 
+        @ApiModelProperty("更新时间")
+        private Date updateTime;
         
         public String jsonString() {
             return JSON.toJSONString(this);