修改管材统计接口

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/controller/MaterialController.java

@@ -241,9 +241,19 @@ public class MaterialController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY,needAuth = false)
 	@GetMapping(value = "/pipeManufacturer")
 	@ApiOperation(httpMethod = "GET",value = "管材厂家统计",  notes = "管材厂家统计")
-	public ResponseModel<List<MaterialCount>> pipeManufacturerStatistics() {
+	public ResponseModel<JSONObject> pipeManufacturerStatistics() {
 		List<MaterialCount> materialCounts = materialServiceImpl.pipeManufacturerStatistics( );
-		return ResponseHelper.buildResponse(materialCounts);
+		JSONObject object = new JSONObject( );
+		JSONArray axisData = new JSONArray( );
+		JSONArray seriesData = new JSONArray( );
+       materialCounts.forEach((m)->{
+		   axisData.add(m.getManufactureAddr());
+		   seriesData.add(m.getSum());
+			   }
+	   );
+		object.put("axisData",axisData);
+		object.put("seriesData",seriesData);
+		return ResponseHelper.buildResponse(object);
 	}
 
 }