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 a26de1760399e310b2f67e13c4bb68808d69346e..42e0292846102f7fecac186150d6e6232041266e 100644 --- a/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/ApiBaseDto.java @@ -10,6 +10,7 @@ import org.springframework.format.annotation.DateTimeFormat; import java.io.Serializable; import java.sql.Timestamp; +import java.util.List; @Data @AllArgsConstructor @@ -23,9 +24,12 @@ public class ApiBaseDto implements Serializable { @ApiModelProperty("服务分类编码") private String apiGroupCode; - @ApiModelProperty("服务分类公司(建设单位)") + @ApiModelProperty("服务分类公司()") private String apiGroupCompanyCode; + @ApiModelProperty("建设单位") + private String apiUnit; + @ApiModelProperty("推广类型0:统建;1:自建") private Integer apiPromotion; @@ -54,6 +58,9 @@ public class ApiBaseDto implements Serializable { @ApiModelProperty("每页条数") private Integer pageSize; + + private List apiGroupCodeList; + public Integer getApiPromotion() { return apiPromotion; } @@ -141,4 +148,20 @@ public class ApiBaseDto implements Serializable { public void setApiGroupCompanyCode(String apiGroupCompanyCode) { this.apiGroupCompanyCode = apiGroupCompanyCode; } + + public String getApiUnit() { + return apiUnit; + } + + public void setApiUnit(String apiUnit) { + this.apiUnit = apiUnit; + } + + public List getApiGroupCodeList() { + return apiGroupCodeList; + } + + public void setApiGroupCodeList(List apiGroupCodeList) { + this.apiGroupCodeList = apiGroupCodeList; + } } diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java index 2e0643c4742ba69d8cb06eb19e3403c9fc05c09b..baa197ef6a07850c90e98495cf75daba78ce24b5 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -197,6 +197,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq); apiGroupCode.clear(); PageInfo pageInfo = new PageInfo<>(ocpApiBaseVos); diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml index f848409a514d26ff24f4b15d1320b5bcf4792695..d498501c2160dfa0855e137ba58cd820a4ece67d 100644 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ b/src/main/resources/mapper/OcpApiGroupMapper.xml @@ -55,8 +55,12 @@ LEFT JOIN ocp_api_extent oae on oab.api_code = oae.api_code where oab.is_delete = 0 - - and oab.api_group_code = #{apiGroupCode} + + and oab.api_group_code in + + #{apiGroupCode} + and oab.api_unit = #{apiUnit}