gic运营商户列表过滤运维资源组

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/qo/EnterpriseQO.java

@@ -29,7 +29,7 @@ public class EnterpriseQO extends PageQO implements Serializable{
     /**
      * 0无效，1有效，2停用，3逾期 4：即将到期
      */
-    private Integer status;
+    private Integer serviceStatus;
     /**
      * 用EnterpriseListOrderByEnum.getOrderBy(orderBy)解析成sql， 可以为null
      * 1:创建时间正序 2:创建时间倒叙 3:到期时间正序 4:到期时间倒叙

gic-platform-operation-web/src/main/java/com/gic/operation/web/controller/EnterpriseController.java

@@ -139,7 +139,7 @@ public class EnterpriseController {
     }
 
     @RequestMapping("/list-enterprise")
-    public RestResponse listEnterprise(String search, Integer serviceVersion, Integer serviceStatus, Integer orderBy,
+    public RestResponse listEnterprise(String search, String serviceVersion, Integer serviceStatus, Integer orderBy,
             PageQO pageQO) {
         if (orderBy == null) {
             orderBy = 0;
@@ -154,9 +154,9 @@ public class EnterpriseController {
             }
         }
         EnterpriseQO params = new EnterpriseQO()
-                .setSearch(search).setServiceVersion(serviceVersion.toString()).setCreatorId(user.getId())
+                .setSearch(search).setServiceVersion(serviceVersion).setCreatorId(user.getId())
                 .setEnterpriseIdList(enterpriseIdList).setOrderBy(EnterpriseListOrderByEnum.getOrderBy(orderBy))
-                .setStatus(serviceStatus);
+                .setServiceStatus(serviceStatus);
         pageQO.setCurrentPage(pageQO.getCurrentPage());
         pageQO.setPageSize(pageQO.getPageSize());
         return ResultControllerUtils.commonResult(enterpriseApiService.listEnterprise(params));