Merge remote-tracking branch 'origin/master'

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<String> 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<String> getApiGroupCodeList() {
+        return apiGroupCodeList;
+    }
+
+    public void setApiGroupCodeList(List<String> apiGroupCodeList) {
+        this.apiGroupCodeList = apiGroupCodeList;
+    }
 }

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

@@ -197,6 +197,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
         apiGroupCode.add(apiBaseReq.getApiGroupCode());
         setGroupIdValue(apiBaseReq.getApiGroupCompanyCode() ,apiBaseReq.getApiGroupCode(),apiBaseReq.getApiPromotion());
         PageHelper.startPage(apiBaseReq.getPageNum(),apiBaseReq.getPageSize());
+        apiBaseReq.setApiGroupCodeList(apiGroupCode);
         List<OcpApiBaseVo> ocpApiBaseVos = ocpApiGroupMapper.selectPageLists(apiBaseReq);
         apiGroupCode.clear();
         PageInfo<OcpApiBaseVo> pageInfo = new PageInfo<>(ocpApiBaseVos);

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
-        <if test="apiGroupCode !=null and apiGroupCode!=''">
-            and  oab.api_group_code = #{apiGroupCode}
+        <if test="apiGroupCodeList !=null ">
+            and  oab.api_group_code in
+            <foreach item="apiGroupCode" collection="apiGroupCodeList" open="(" separator=","
+                     close=")">
+                #{apiGroupCode}
+            </foreach>
         </if>
         <if test="apiUnit !=null and apiUnit!=''">
             and  oab.api_unit = #{apiUnit}