租户审核-对象变更

common/common-entity/src/main/java/com/yihu/jw/entity/base/saas/SaasDO.java

@@ -16,45 +16,49 @@ import javax.persistence.Table;
public class SaasDO extends UuidIdentityEntityWithOperator {
    public enum Status {
    	//待审核
        //待审核
        auditWait,
		//审核通过
        //审核通过
        auditPassed,
		//审核不通过
        //审核不通过
        auditNotPassed,
		//已删除
		delete
        //已删除
        delete
    }
    private String orgCode; //机构编码
	private String name; //系统名称
	private Status status; //状态  0待审核 1审核通过 2审核不通过 3已删除
	private String remark; //备注
	private String logo; //远程fastDFS文件地址
    private String name; //系统名称
    private Status status; //状态  0待审核 1审核通过 2审核不通过 3已删除
    private String remark; //备注
    private String logo; //远程fastDFS文件地址
    private Integer type; //类型
	private String manager; //管理员 - 关联user表id字段
	private String email; //管理员邮箱
	private String mobile; //管理员手机号码
	@Column(name = "org_code", nullable = false)
	public String getOrgCode() {
		return orgCode;
	}
    private String manager; //管理员 - 关联user表id字段
    private String email; //管理员邮箱
    private String mobile; //管理员手机号码
    //审核不通过的原因
    private String auditFailedReason;
    //管理员姓名
    private String managerName;
    @Column(name = "org_code", nullable = false)
    public String getOrgCode() {
        return orgCode;
    }
	public void setOrgCode(String orgCode) {
		this.orgCode = orgCode;
	}
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
	@Column(name = "name", nullable = false, length = 200)
	public String getName() {
		return this.name;
	}
    @Column(name = "name", nullable = false, length = 200)
    public String getName() {
        return this.name;
    }
	public void setName(String name) {
		this.name = name;
	}
    public void setName(String name) {
        this.name = name;
    }
	@Column(name = "status", nullable = false)
    @Column(name = "status", nullable = false)
    public Status getStatus() {
        return status;
    }
@@ -64,56 +68,74 @@ public class SaasDO extends UuidIdentityEntityWithOperator {
    }
    @Column(name = "remark")
	public String getRemark() {
		return this.remark;
	}
	public void setRemark(String remark) {
		this.remark = remark;
	}
	@Column(name = "logo")
	public String getLogo() {
		return logo;
	}
	public void setLogo(String logo) {
		this.logo = logo;
	}
	@Column(name = "type", nullable = false)
	public Integer getType() {
		return type;
	}
	public void setType(Integer type) {
		this.type = type;
	}
	@Column(name = "manager", length = 50)
	public String getManager() {
		return manager;
	}
	public void setManager(String manager) {
		this.manager = manager;
	}
	@Column(name = "email")
	public String getEmail() {
		return email;
	}
	public void setEmail(String email) {
		this.email = email;
	}
	@Column(name = "mobile")
	public String getMobile() {
		return mobile;
	}
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
    public String getRemark() {
        return this.remark;
    }
    public void setRemark(String remark) {
        this.remark = remark;
    }
    @Column(name = "logo")
    public String getLogo() {
        return logo;
    }
    public void setLogo(String logo) {
        this.logo = logo;
    }
    @Column(name = "type", nullable = false)
    public Integer getType() {
        return type;
    }
    public void setType(Integer type) {
        this.type = type;
    }
    @Column(name = "manager", length = 50)
    public String getManager() {
        return manager;
    }
    public void setManager(String manager) {
        this.manager = manager;
    }
    @Column(name = "email")
    public String getEmail() {
        return email;
    }
    public void setEmail(String email) {
        this.email = email;
    }
    @Column(name = "mobile")
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    @Column(name = "audit_failed_reason")
    public String getAuditFailedReason() {
        return auditFailedReason;
    }
    public void setAuditFailedReason(String auditFailedReason) {
        this.auditFailedReason = auditFailedReason;
    }
    @Column(name = "manager_name")
    public String getManagerName() {
        return managerName;
    }
    public void setManagerName(String managerName) {
        this.managerName = managerName;
    }
}

common/common-rest-model/src/main/java/com/yihu/jw/restmodel/base/saas/SaasVO.java

@@ -13,40 +13,46 @@ import io.swagger.annotations.ApiModelProperty;
@ApiModel(value = "SaasVO", description = "SAAS")
public class SaasVO extends UuidIdentityVOWithOperator {
	@ApiModelProperty(value = "机构编码", example = "495323X")
	private String orgCode;
	@ApiModelProperty(value = "系统名称", example = "厦门医疗服务")
	private String name;
	@ApiModelProperty(value = "状态", example = "auditPassed")
	private SaasDO.Status status;
	@ApiModelProperty(value = "备注", example = "我是备注")
	private String remark;
	@ApiModelProperty(value = "远程fastDFS文件地址", example = "group1:M00/97/E9/wKgyJltp1i-AHHf6AAAvRXBaR18423.zip")
	private String logo;
	@ApiModelProperty(value = "类型（租户类型编码，从1开始自增）", example = "1")
    @ApiModelProperty(value = "机构编码", example = "495323X")
    private String orgCode;
    @ApiModelProperty(value = "系统名称", example = "厦门医疗服务")
    private String name;
    @ApiModelProperty(value = "状态", example = "auditPassed")
    private SaasDO.Status status;
    @ApiModelProperty(value = "备注", example = "我是备注")
    private String remark;
    @ApiModelProperty(value = "远程fastDFS文件地址", example = "group1:M00/97/E9/wKgyJltp1i-AHHf6AAAvRXBaR18423.zip")
    private String logo;
    @ApiModelProperty(value = "类型（租户类型编码，从1开始自增）", example = "1")
    private Integer type;
	@ApiModelProperty(value = "管理员 - 关联user表id字段", example = "402303ee656498890165649ad2wa00sd")
	private String manager;
	@ApiModelProperty(value = "管理员邮箱", example = "admin@jkzl.com")
	private String email;
	@ApiModelProperty(value = "管理员手机号码", example = "18888888888")
	private String mobile;
	public String getOrgCode() {
		return orgCode;
	}
    @ApiModelProperty(value = "管理员 - 关联user表id字段", example = "402303ee656498890165649ad2wa00sd")
    private String manager;
    @ApiModelProperty(value = "管理员邮箱", example = "admin@jkzl.com")
    private String email;
    @ApiModelProperty(value = "管理员手机号码", example = "18888888888")
    private String mobile;
    @ApiModelProperty(value = "审核不通过的原因", example = "信息不准确")
    private String auditFailedReason;
    @ApiModelProperty(value = "租户类型名称", example = "家医型")
    private String typeName;
    @ApiModelProperty(value = "管理员姓名", example = "张三")
    private String managerName;
    public String getOrgCode() {
        return orgCode;
    }
	public void setOrgCode(String orgCode) {
		this.orgCode = orgCode;
	}
    public void setOrgCode(String orgCode) {
        this.orgCode = orgCode;
    }
	public String getName() {
		return this.name;
	}
    public String getName() {
        return this.name;
    }
	public void setName(String name) {
		this.name = name;
	}
    public void setName(String name) {
        this.name = name;
    }
    public SaasDO.Status getStatus() {
        return status;
@@ -56,51 +62,75 @@ public class SaasVO extends UuidIdentityVOWithOperator {
        this.status = status;
    }
	public String getRemark() {
		return this.remark;
	}
    public String getRemark() {
        return this.remark;
    }
	public void setRemark(String remark) {
		this.remark = remark;
	}
    public void setRemark(String remark) {
        this.remark = remark;
    }
	public String getLogo() {
		return logo;
	}
    public String getLogo() {
        return logo;
    }
	public void setLogo(String logo) {
		this.logo = logo;
	}
    public void setLogo(String logo) {
        this.logo = logo;
    }
	public Integer getType() {
		return type;
	}
    public Integer getType() {
        return type;
    }
	public void setType(Integer type) {
		this.type = type;
	}
    public void setType(Integer type) {
        this.type = type;
    }
	public String getManager() {
		return manager;
	}
    public String getManager() {
        return manager;
    }
	public void setManager(String manager) {
		this.manager = manager;
	}
    public void setManager(String manager) {
        this.manager = manager;
    }
	public String getEmail() {
		return email;
	}
    public String getEmail() {
        return email;
    }
	public void setEmail(String email) {
		this.email = email;
	}
    public void setEmail(String email) {
        this.email = email;
    }
	public String getMobile() {
		return mobile;
	}
    public String getMobile() {
        return mobile;
    }
    public void setMobile(String mobile) {
        this.mobile = mobile;
    }
    public String getAuditFailedReason() {
        return auditFailedReason;
    }
    public void setAuditFailedReason(String auditFailedReason) {
        this.auditFailedReason = auditFailedReason;
    }
	public void setMobile(String mobile) {
		this.mobile = mobile;
	}
    public String getTypeName() {
        return typeName;
    }
    public void setTypeName(String typeName) {
        this.typeName = typeName;
    }
    public String getManagerName() {
        return managerName;
    }
    public void setManagerName(String managerName) {
        this.managerName = managerName;
    }
}

svr/svr-base/src/main/java/com/yihu/jw/base/endpoint/saas/SaasTypeDictEndpoint.java

@@ -1,7 +1,6 @@
package com.yihu.jw.base.endpoint.saas;
import com.yihu.jw.base.contant.CommonContant;
import com.yihu.jw.base.dao.module.SaasTypeModuleDao;
import com.yihu.jw.base.service.module.ModuleService;
import com.yihu.jw.base.service.module.SaasTypeModuleService;
import com.yihu.jw.base.service.saas.SaasTypeDictService;