diff --git a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java index d27e540afd864f7a7fd2fddbbf0f2dc7e57400f4..d295444a34be35fc70fa21b57288c991ec5117d6 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java @@ -78,13 +78,7 @@ public class ApiBaseDto implements Serializable { private List apiGroupCodeList; - public Integer getApiPromotion() { - return apiPromotion; - } - public void setApiPromotion(Integer apiPromotion) { - this.apiPromotion = apiPromotion; - } public String getApiCode() { return apiCode; diff --git a/src/main/java/com/pms/ocp/model/dto/TenantDto.java b/src/main/java/com/pms/ocp/model/dto/TenantDto.java index 85123a461552bbe3b77877bd064780d04e8f92c0..a469911ad289b5ad5cf20805a4286739b1dcc9b9 100644 --- a/src/main/java/com/pms/ocp/model/dto/TenantDto.java +++ b/src/main/java/com/pms/ocp/model/dto/TenantDto.java @@ -33,8 +33,8 @@ public class TenantDto implements Serializable { @ApiModelProperty("建设单位") private String tenantUnit; -// @ApiModelProperty("推广类型0:统建;1:自建") -// private Integer apiPromotion; + @ApiModelProperty("推广类型0:统建;1:自建") + private Integer tenantPromotion; @ApiModelProperty("注册时段-开始") @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @@ -165,4 +165,12 @@ public class TenantDto implements Serializable { public void setCurrentPage(Integer currentPage) { this.currentPage = currentPage; } + + public Integer getTenantPromotion() { + return tenantPromotion; + } + + public void setTenantPromotion(Integer tenantPromotion) { + this.tenantPromotion = tenantPromotion; + } } diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index 337e9d8a116c29d50a262cfbb224eda9dbaa803b..89bef1d89ea4591fa62e31f9e5bd467eb6d8906f 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -51,6 +51,10 @@ and otb.tenant_unit = #{tenantUnit} + + and otb.tenant_promotion = #{tenantPromotion} + + = #{startCTime}