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 4d4bc0f9663a35919743dc3fa20381aad77652f8..369e5a9b6c0a5f8c21af2f4b07c8ae4166b0e242 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 a5dca363543dd478a20043e31bcb81aac9eb7994..ce232bbece32e02d91386bfebf4a7a6d0d475b4f 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 16081632d94aebb73c19584e8ce97b579b6f8430..fca2619f7db6e86543b655f8e8de7c851027d82a 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}