企业自主管理-各街镇单位情况

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/BscEnterpriseAutonomyServiceImpl.java

@@ -658,17 +658,33 @@ public class BscEnterpriseAutonomyServiceImpl extends AbstractCrudService<BscEnt
 
     @Override
     public Object streetCompany() {
+        List<String> streetTownList = new ArrayList<>();
+        streetTownList.add("华漕镇");
+        streetTownList.add("新虹街道");
+        streetTownList.add("七宝镇");
+        streetTownList.add("虹桥镇");
+        streetTownList.add("古美路街道");
+        streetTownList.add("莘庄镇");
+        streetTownList.add("梅陇镇");
+        streetTownList.add("颛桥镇");
+        streetTownList.add("马桥镇");
+        streetTownList.add("江川路街道");
+        streetTownList.add("吴泾镇");
+        streetTownList.add("浦锦街道");
+        streetTownList.add("浦江镇");
         QueryWrapper<BaseCompany> query = Wrappers.query();
         query.select("street_town as streetTown", "company_type as companyType", "count(id) as count")
                 .eq("enable", 0)
-                .ne("street_town", "")
+//                .ne("street_town", "")
+                .in("street_town",streetTownList)
                 .groupBy("street_town,company_type");
         List<Map<String, Object>> list1 = baseCompanyService.listMaps(query);
 
         QueryWrapper<BaseCompany> query1 = Wrappers.query();
         query1.select("street_town as streetTown")
                 .eq("enable", 0)
-                .ne("street_town", "")
+//                .ne("street_town", "")
+                .in("street_town",streetTownList)
                 .groupBy("street_town");
         List<Map<String, Object>> list2 = baseCompanyService.listMaps(query1);