update

src/main/java/com/zhiqiyun/open/mvc/controller/PlaceBaseInfoController.java

@@ -27,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -142,15 +143,30 @@ public class PlaceBaseInfoController {
 	@Permission(value = "place.base.info.gis.map", tags = "分类组查询数量", writeLog = false)
 	@PostMapping("/findByGroupByDataType")
 	public Result findByGroupByDataType() {
-		QueryWrapper<PlaceBaseInfo> queryWrapper = new QueryWrapper<>();
-		queryWrapper.select("category_id, count(1) num");
-		queryWrapper.groupBy("category_id");
-		List<Map<String, Object>> listData = this.placeBaseInfoService.listMaps(queryWrapper);
-		for (Map<String, Object> dataMap : listData) {
-			Long categoryId = Long.valueOf(dataMap.get("category_id").toString());
-			PlaceCategory category = this.placeCategoryService.getById(categoryId);
+		List<PlaceCategory> list = this.placeCategoryService.list();
+		List<Map<String, Object>> listData = new ArrayList<>();
+		for (PlaceCategory category : list) {
+			Map<String, Object> dataMap = new HashMap<>();
+
+			QueryWrapper<PlaceBaseInfo> queryWrapper = new QueryWrapper<>();
+			queryWrapper.eq("category_id", category.getCategoryId());
+
+			long num = this.placeBaseInfoService.count(queryWrapper);
+
+			dataMap.put("num", num);
 			dataMap.put("category", category);
+			listData.add(dataMap);
 		}
+
+//		QueryWrapper<PlaceBaseInfo> queryWrapper = new QueryWrapper<>();
+//		queryWrapper.select("category_id, count(1) num");
+//		queryWrapper.groupBy("category_id");
+//		List<Map<String, Object>> listData = this.placeBaseInfoService.listMaps(queryWrapper);
+//		for (Map<String, Object> dataMap : listData) {
+//			Long categoryId = Long.valueOf(dataMap.get("category_id").toString());
+//			PlaceCategory category = this.placeCategoryService.getById(categoryId);
+//			dataMap.put("category", category);
+//		}
 		return Result.instance(Result.Code.SUCCESS).setData(listData);
 	}