问题修复

src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java

@@ -85,6 +85,7 @@ public class OcpApiSubs {
   @ApiModelProperty("服务版本（最新版本）")
   private long apiVersion;
 
+
   public String getObjId() {
     return objId;
   }
@@ -141,14 +142,6 @@ public class OcpApiSubs {
     this.subsCompanyCode = subsCompanyCode;
   }
 
-  public String getIsDelete() {
-    return this.isDelete == 0 ?"已订阅":"取消订阅";
-  }
-
-  public void setIsDelete(long isDelete) {
-    this.isDelete = isDelete;
-  }
-
   public String getApiName() {
     return apiName;
   }

src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java

@@ -10,6 +10,7 @@ import lombok.Data;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
+import java.sql.Timestamp;
 import java.util.Date;
 
 /**
@@ -18,7 +19,6 @@ import java.util.Date;
  */
 @Data
 @Accessors(chain = true)
-@TableName("ocp_tenant_audit")
 @ApiModel("应用事记表1")
 public class OcpTenantAudit implements Serializable {
     /**
@@ -101,222 +101,413 @@ public class OcpTenantAudit implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 主键
-     */
+    @ApiModelProperty("服务编码")
+    private String apiCode;
+
+    @ApiModelProperty("服务部署公司")
+    private String apiDepCompanyCode;
+
+    @ApiModelProperty("应用所属公司")
+    private String tenantDepCompanyCode;
+
+    @ApiModelProperty("关系创建时间")
+    private Timestamp apiTenantRelCtime;
+
+    @ApiModelProperty("关系创建时间")
+    private Timestamp apiTenantRelMtime;
+
+    @ApiModelProperty("关系创建用户ID")
+    private String apiTenantRelUserId;
+
+    @ApiModelProperty("关系创建用户")
+    private String apiTenantRelUserName;
+
+    @ApiModelProperty("是否已删除0未删除，1已删除")
+    private long isDelete;
+
+    @ApiModelProperty("服务接口中文名称")
+    private String apiName;
+
+    @ApiModelProperty("服务分类代码")
+    private String apiGroupCode;
+
+    @ApiModelProperty("推广类型0:统建；1:自建")
+    private long apiPromotion;
+
+    @ApiModelProperty("服务请求体")
+    private String apiReq;
+
+    @ApiModelProperty("服务返回体")
+    private String apiResp;
+
+    @ApiModelProperty("服务地址")
+    private String apiUrl;
+
+    @ApiModelProperty("服务创建时间")
+    private Timestamp apiCtime;
+
+    @ApiModelProperty("服务修改时间")
+    private Timestamp apiMtime;
+
+    @ApiModelProperty("创建者用户ID")
+    private String apiUserId;
+
+    @ApiModelProperty("建设单位")
+    private String apiUnit;
+
+    @ApiModelProperty("服务所属公司")
+    private String ownerCompanyCode;
+
+    @ApiModelProperty("服务所属公司")
+    private String ownerCompanyName;
+
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private long apiZone;
+
+    @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private long apiLayer;
+
+    @ApiModelProperty("服务版本（最新版本）")
+    private long apiVersion;
+
     public String getObjId() {
         return objId;
     }
 
-    /**
-     * 主键
-     */
     public void setObjId(String objId) {
         this.objId = objId;
     }
 
-    /**
-     * 应用code
-     */
     public String getTenantCode() {
         return tenantCode;
     }
 
-    /**
-     * 应用code
-     */
     public void setTenantCode(String tenantCode) {
         this.tenantCode = tenantCode;
     }
 
-    /**
-     * 操作状态0:新增,1:迭代；2，下线
-     */
     public Short getOperStatus() {
         return operStatus;
     }
 
-    /**
-     * 操作状态0:新增,1:迭代；2，下线
-     */
     public void setOperStatus(Short operStatus) {
         this.operStatus = operStatus;
     }
 
-    /**
-     * 类型0:人工操作,1:流程管控,3:总部下发
-     */
     public Short getAuditType() {
         return auditType;
     }
 
-    /**
-     * 类型0:人工操作,1:流程管控,3:总部下发
-     */
     public void setAuditType(Short auditType) {
         this.auditType = auditType;
     }
 
-    /**
-     * 备注简述
-     */
     public String getAuditMessage() {
         return auditMessage;
     }
 
-    /**
-     * 备注简述
-     */
     public void setAuditMessage(String auditMessage) {
         this.auditMessage = auditMessage;
     }
 
-    /**
-     * 应用事记内容
-     */
     public String getAuditJson() {
         return auditJson;
     }
 
-    /**
-     * 应用事记内容
-     */
     public void setAuditJson(String auditJson) {
         this.auditJson = auditJson;
     }
 
-    /**
-     * 提交人id
-     */
     public String getAuditUserId() {
         return auditUserId;
     }
 
-    /**
-     * 提交人id
-     */
     public void setAuditUserId(String auditUserId) {
         this.auditUserId = auditUserId;
     }
 
-    /**
-     * 提交人姓名
-     */
     public String getAuditUserName() {
         return auditUserName;
     }
 
-    /**
-     * 提交人姓名
-     */
     public void setAuditUserName(String auditUserName) {
         this.auditUserName = auditUserName;
     }
 
-    /**
-     * 创建时间
-     */
     public Date getAuditCtime() {
         return auditCtime;
     }
 
-    /**
-     * 创建时间
-     */
     public void setAuditCtime(Date auditCtime) {
         this.auditCtime = auditCtime;
     }
 
-    /**
-     * 应用版本(当前版本)
-     */
     public String getApplyVersion() {
         return applyVersion;
     }
 
-    /**
-     * 应用版本(当前版本)
-     */
     public void setApplyVersion(String applyVersion) {
         this.applyVersion = applyVersion;
     }
 
-    /**
-     * 上一版本
-     */
     public String getPerTenantVersion() {
         return perTenantVersion;
     }
 
-    /**
-     * 上一版本
-     */
     public void setPerTenantVersion(String perTenantVersion) {
         this.perTenantVersion = perTenantVersion;
     }
 
-    @Override
-    public boolean equals(Object that) {
-        if (this == that) {
-            return true;
-        }
-        if (that == null) {
-            return false;
-        }
-        if (getClass() != that.getClass()) {
-            return false;
-        }
-        OcpTenantAudit other = (OcpTenantAudit) that;
-        return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
-                && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode()))
-                && (this.getOperStatus() == null ? other.getOperStatus() == null : this.getOperStatus().equals(other.getOperStatus()))
-                && (this.getAuditType() == null ? other.getAuditType() == null : this.getAuditType().equals(other.getAuditType()))
-                && (this.getAuditMessage() == null ? other.getAuditMessage() == null : this.getAuditMessage().equals(other.getAuditMessage()))
-                && (this.getAuditJson() == null ? other.getAuditJson() == null : this.getAuditJson().equals(other.getAuditJson()))
-                && (this.getAuditUserId() == null ? other.getAuditUserId() == null : this.getAuditUserId().equals(other.getAuditUserId()))
-                && (this.getAuditUserName() == null ? other.getAuditUserName() == null : this.getAuditUserName().equals(other.getAuditUserName()))
-                && (this.getAuditCtime() == null ? other.getAuditCtime() == null : this.getAuditCtime().equals(other.getAuditCtime()))
-                && (this.getApplyVersion() == null ? other.getApplyVersion() == null : this.getApplyVersion().equals(other.getApplyVersion()))
-                && (this.getPerTenantVersion() == null ? other.getPerTenantVersion() == null : this.getPerTenantVersion().equals(other.getPerTenantVersion()));
-    }
-
-    @Override
-    public int hashCode() {
-        final int prime = 31;
-        int result = 1;
-        result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode());
-        result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode());
-        result = prime * result + ((getOperStatus() == null) ? 0 : getOperStatus().hashCode());
-        result = prime * result + ((getAuditType() == null) ? 0 : getAuditType().hashCode());
-        result = prime * result + ((getAuditMessage() == null) ? 0 : getAuditMessage().hashCode());
-        result = prime * result + ((getAuditJson() == null) ? 0 : getAuditJson().hashCode());
-        result = prime * result + ((getAuditUserId() == null) ? 0 : getAuditUserId().hashCode());
-        result = prime * result + ((getAuditUserName() == null) ? 0 : getAuditUserName().hashCode());
-        result = prime * result + ((getAuditCtime() == null) ? 0 : getAuditCtime().hashCode());
-        result = prime * result + ((getApplyVersion() == null) ? 0 : getApplyVersion().hashCode());
-        result = prime * result + ((getPerTenantVersion() == null) ? 0 : getPerTenantVersion().hashCode());
-        return result;
-    }
-
-    @Override
-    public String toString() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(getClass().getSimpleName());
-        sb.append(" [");
-        sb.append("Hash = ").append(hashCode());
-        sb.append(", objId=").append(objId);
-        sb.append(", tenantCode=").append(tenantCode);
-        sb.append(", operStatus=").append(operStatus);
-        sb.append(", auditType=").append(auditType);
-        sb.append(", auditMessage=").append(auditMessage);
-        sb.append(", auditJson=").append(auditJson);
-        sb.append(", auditUserId=").append(auditUserId);
-        sb.append(", auditUserName=").append(auditUserName);
-        sb.append(", auditCtime=").append(auditCtime);
-        sb.append(", applyVersion=").append(applyVersion);
-        sb.append(", perTenantVersion=").append(perTenantVersion);
-        sb.append(", serialVersionUID=").append(serialVersionUID);
-        sb.append("]");
-        return sb.toString();
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getApiCode() {
+        return apiCode;
     }
+
+    public void setApiCode(String apiCode) {
+        this.apiCode = apiCode;
+    }
+
+    public String getApiDepCompanyCode() {
+        return apiDepCompanyCode;
+    }
+
+    public void setApiDepCompanyCode(String apiDepCompanyCode) {
+        this.apiDepCompanyCode = apiDepCompanyCode;
+    }
+
+    public String getTenantDepCompanyCode() {
+        return tenantDepCompanyCode;
+    }
+
+    public void setTenantDepCompanyCode(String tenantDepCompanyCode) {
+        this.tenantDepCompanyCode = tenantDepCompanyCode;
+    }
+
+    public Timestamp getApiTenantRelCtime() {
+        return apiTenantRelCtime;
+    }
+
+    public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) {
+        this.apiTenantRelCtime = apiTenantRelCtime;
+    }
+
+    public Timestamp getApiTenantRelMtime() {
+        return apiTenantRelMtime;
+    }
+
+    public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) {
+        this.apiTenantRelMtime = apiTenantRelMtime;
+    }
+
+    public String getApiTenantRelUserId() {
+        return apiTenantRelUserId;
+    }
+
+    public void setApiTenantRelUserId(String apiTenantRelUserId) {
+        this.apiTenantRelUserId = apiTenantRelUserId;
+    }
+
+    public String getApiTenantRelUserName() {
+        return apiTenantRelUserName;
+    }
+
+    public void setApiTenantRelUserName(String apiTenantRelUserName) {
+        this.apiTenantRelUserName = apiTenantRelUserName;
+    }
+
+    public long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getApiName() {
+        return apiName;
+    }
+
+    public void setApiName(String apiName) {
+        this.apiName = apiName;
+    }
+
+    public String getApiGroupCode() {
+        return apiGroupCode;
+    }
+
+    public void setApiGroupCode(String apiGroupCode) {
+        this.apiGroupCode = apiGroupCode;
+    }
+
+    public long getApiPromotion() {
+        return apiPromotion;
+    }
+
+    public void setApiPromotion(long apiPromotion) {
+        this.apiPromotion = apiPromotion;
+    }
+
+    public String getApiReq() {
+        return apiReq;
+    }
+
+    public void setApiReq(String apiReq) {
+        this.apiReq = apiReq;
+    }
+
+    public String getApiResp() {
+        return apiResp;
+    }
+
+    public void setApiResp(String apiResp) {
+        this.apiResp = apiResp;
+    }
+
+    public String getApiUrl() {
+        return apiUrl;
+    }
+
+    public void setApiUrl(String apiUrl) {
+        this.apiUrl = apiUrl;
+    }
+
+    public Timestamp getApiCtime() {
+        return apiCtime;
+    }
+
+    public void setApiCtime(Timestamp apiCtime) {
+        this.apiCtime = apiCtime;
+    }
+
+    public Timestamp getApiMtime() {
+        return apiMtime;
+    }
+
+    public void setApiMtime(Timestamp apiMtime) {
+        this.apiMtime = apiMtime;
+    }
+
+    public String getApiUserId() {
+        return apiUserId;
+    }
+
+    public void setApiUserId(String apiUserId) {
+        this.apiUserId = apiUserId;
+    }
+
+    public String getApiUnit() {
+        return apiUnit;
+    }
+
+    public void setApiUnit(String apiUnit) {
+        this.apiUnit = apiUnit;
+    }
+
+    public String getOwnerCompanyCode() {
+        return ownerCompanyCode;
+    }
+
+    public void setOwnerCompanyCode(String ownerCompanyCode) {
+        this.ownerCompanyCode = ownerCompanyCode;
+    }
+
+    public String getOwnerCompanyName() {
+        return ownerCompanyName;
+    }
+
+    public void setOwnerCompanyName(String ownerCompanyName) {
+        this.ownerCompanyName = ownerCompanyName;
+    }
+
+    public long getApiZone() {
+        return apiZone;
+    }
+
+    public void setApiZone(long apiZone) {
+        this.apiZone = apiZone;
+    }
+
+    public long getApiLayer() {
+        return apiLayer;
+    }
+
+    public void setApiLayer(long apiLayer) {
+        this.apiLayer = apiLayer;
+    }
+
+    public long getApiVersion() {
+        return apiVersion;
+    }
+
+    public void setApiVersion(long apiVersion) {
+        this.apiVersion = apiVersion;
+    }
+
+//    @Override
+//    public boolean equals(Object that) {
+//        if (this == that) {
+//            return true;
+//        }
+//        if (that == null) {
+//            return false;
+//        }
+//        if (getClass() != that.getClass()) {
+//            return false;
+//        }
+//        OcpTenantAudit other = (OcpTenantAudit) that;
+//        return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId()))
+//                && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode()))
+//                && (this.getOperStatus() == null ? other.getOperStatus() == null : this.getOperStatus().equals(other.getOperStatus()))
+//                && (this.getAuditType() == null ? other.getAuditType() == null : this.getAuditType().equals(other.getAuditType()))
+//                && (this.getAuditMessage() == null ? other.getAuditMessage() == null : this.getAuditMessage().equals(other.getAuditMessage()))
+//                && (this.getAuditJson() == null ? other.getAuditJson() == null : this.getAuditJson().equals(other.getAuditJson()))
+//                && (this.getAuditUserId() == null ? other.getAuditUserId() == null : this.getAuditUserId().equals(other.getAuditUserId()))
+//                && (this.getAuditUserName() == null ? other.getAuditUserName() == null : this.getAuditUserName().equals(other.getAuditUserName()))
+//                && (this.getAuditCtime() == null ? other.getAuditCtime() == null : this.getAuditCtime().equals(other.getAuditCtime()))
+//                && (this.getApplyVersion() == null ? other.getApplyVersion() == null : this.getApplyVersion().equals(other.getApplyVersion()))
+//                && (this.getPerTenantVersion() == null ? other.getPerTenantVersion() == null : this.getPerTenantVersion().equals(other.getPerTenantVersion()));
+//    }
+//
+//    @Override
+//    public int hashCode() {
+//        final int prime = 31;
+//        int result = 1;
+//        result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode());
+//        result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode());
+//        result = prime * result + ((getOperStatus() == null) ? 0 : getOperStatus().hashCode());
+//        result = prime * result + ((getAuditType() == null) ? 0 : getAuditType().hashCode());
+//        result = prime * result + ((getAuditMessage() == null) ? 0 : getAuditMessage().hashCode());
+//        result = prime * result + ((getAuditJson() == null) ? 0 : getAuditJson().hashCode());
+//        result = prime * result + ((getAuditUserId() == null) ? 0 : getAuditUserId().hashCode());
+//        result = prime * result + ((getAuditUserName() == null) ? 0 : getAuditUserName().hashCode());
+//        result = prime * result + ((getAuditCtime() == null) ? 0 : getAuditCtime().hashCode());
+//        result = prime * result + ((getApplyVersion() == null) ? 0 : getApplyVersion().hashCode());
+//        result = prime * result + ((getPerTenantVersion() == null) ? 0 : getPerTenantVersion().hashCode());
+//        return result;
+//    }
+//
+//    @Override
+//    public String toString() {
+//        StringBuilder sb = new StringBuilder();
+//        sb.append(getClass().getSimpleName());
+//        sb.append(" [");
+//        sb.append("Hash = ").append(hashCode());
+//        sb.append(", objId=").append(objId);
+//        sb.append(", tenantCode=").append(tenantCode);
+//        sb.append(", operStatus=").append(operStatus);
+//        sb.append(", auditType=").append(auditType);
+//        sb.append(", auditMessage=").append(auditMessage);
+//        sb.append(", auditJson=").append(auditJson);
+//        sb.append(", auditUserId=").append(auditUserId);
+//        sb.append(", auditUserName=").append(auditUserName);
+//        sb.append(", auditCtime=").append(auditCtime);
+//        sb.append(", applyVersion=").append(applyVersion);
+//        sb.append(", perTenantVersion=").append(perTenantVersion);
+//        sb.append(", serialVersionUID=").append(serialVersionUID);
+//        sb.append("]");
+//        return sb.toString();
+//    }
 }
\ No newline at end of file

src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java

@@ -70,6 +70,120 @@ public class OcpTenantSubs implements Serializable {
     @ApiModelProperty("是否删除0-否，1-是")
     private Short isDelete;
 
+
+    /**
+     * 应用名称
+     */
+    @ApiModelProperty("应用名称")
+    private String tenantName;
+
+
+    /**
+     * 应用分类代码
+     */
+    @ApiModelProperty("应用分类代码")
+    private String tenantGroupCode;
+
+    /**
+     * 应用ip
+     */
+    @ApiModelProperty("应用ip")
+    private String tenantIp;
+
+    /**
+     * 应用url
+     */
+    @ApiModelProperty("应用url")
+    private String tenantUrl;
+
+    /**
+     * 所属专业
+     */
+    @ApiModelProperty("所属专业")
+    private String professionalKind;
+
+    /**
+     * 创建者用户ID
+     */
+    @ApiModelProperty("创建者用户ID")
+    private String tenantUserId;
+
+    /**
+     * 排序
+     */
+    @ApiModelProperty("排序")
+    private Integer tenantOrderNo;
+
+    /**
+     * 创建时间
+     */
+    @ApiModelProperty("创建时间")
+    private Timestamp tenantCtime;
+
+    /**
+     * 最后更新时间
+     */
+    @ApiModelProperty("最后更新时间")
+    private Timestamp tenantMtime;
+
+    /**
+     * 部署名称
+     */
+    @ApiModelProperty("部署名称")
+    private String deploymentName;
+
+    /**
+     * 描述
+     */
+    @ApiModelProperty("描述")
+    private String tenantDescription;
+
+    /**
+     * 应用状态0:设计态；1:运行态
+     */
+    @ApiModelProperty("应用状态0:设计态；1:运行态")
+    private Short tenantState;
+    /**
+     * 推广类型0:统建；1:自建
+     */
+    @ApiModelProperty("推广类型0:统建；1:自建")
+    private long tenantPromotion;
+    /**
+     * 建设单位
+     */
+    @ApiModelProperty("建设单位")
+    private String tenantUnit;
+
+    /**
+     * 所属公司编码
+     */
+    @ApiModelProperty("所属公司编码")
+    private String ownerCompanyCode;
+
+    /**
+     * 所属公司名称
+     */
+    @ApiModelProperty("所属公司名称")
+    private String ownerCompanyName;
+
+    /**
+     * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区
+     */
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private Short tenantZone;
+
+    /**
+     * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层;
+     */
+    @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private Short tenantLayer;
+
+    /**
+     * 应用版本（当前版本）
+     */
+    @ApiModelProperty("应用版本（当前版本）")
+    private String tenantVersion;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -170,20 +284,7 @@ public class OcpTenantSubs implements Serializable {
         this.subsLogTenantAtime = subsLogTenantAtime;
     }
 
-    /**
-     * 是否删除0-否，1-是
-     * @return
-     */
-    public String getIsDelete() {
-        return this.isDelete == 0 ?"已订阅":"取消订阅";
-    }
 
-    /**
-     * 是否删除0-否，1-是
-     */
-    public void setIsDelete(Short isDelete) {
-        this.isDelete = isDelete;
-    }
 
     @Override
     public boolean equals(Object that) {

src/main/java/com/pms/ocp/service/OcpTenantAuditService.java

 package com.pms.ocp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
 import com.pms.ocp.model.entity.OcpTenantAudit;
 import com.pms.ocp.model.vo.ResponseVO;
 

src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java

@@ -5,7 +5,9 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pms.ocp.common.constants.AnalysisConstant;
 import com.pms.ocp.common.constants.ExportUtils;
+import com.pms.ocp.mapper.OcpApiTenantRelMapper;
 import com.pms.ocp.mapper.OcpTenantAuditMapper;
+import com.pms.ocp.model.entity.OcpApiTenantRel;
 import com.pms.ocp.model.entity.OcpTenantAudit;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.OcpTenantAuditService;
@@ -22,6 +24,9 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,
     @Autowired
     private OcpTenantAuditMapper ocpTenantAuditMapper;
 
+    @Autowired
+    private OcpApiTenantRelMapper ocpApiTenantRelMapper;
+
     @Override
     public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) {
         List<OcpTenantAudit> otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit);
@@ -44,7 +49,7 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,
 
     @Override
     public ResponseVO OtaById(OcpTenantAudit ocpTenantAudit) {
-        List<OcpTenantAudit> otaById = ocpTenantAuditMapper.OtaById(ocpTenantAudit);
-        return ResponseVO.ok(otaById);
+        List<OcpTenantAudit> oatrList = ocpTenantAuditMapper.OtaById(ocpTenantAudit);
+        return ResponseVO.ok(oatrList);
     }
 }

src/main/resources/mapper/OcpTenantAuditMapper.xml

@@ -10,9 +10,11 @@
     </select>
 
     <select id="OtaById" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
-        select * from ocp_tenant_audit ota
-         LEFT JOIN ocp_tenant_base otb
-          on ota.tenant_code = otb.tenant_code
-           where ota.obj_id = #{objId}
+        SELECT * from ocp_api_tenant_rel oatr
+         LEFT JOIN ocp_tenant_audit ota
+         on oatr.tenant_code = ota.tenant_code
+         INNER JOIN ocp_api_base oab
+         on oatr.api_code = oab.api_code
+         where oatr.tenant_code = #{tenantCode}
     </select>
 </mapper>
\ No newline at end of file