修改bug

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/SafetyPreCtrlController.java

@@ -98,8 +98,6 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 		return temph;
 	}
 
-
-
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(value = "巡检情况统计", notes = "巡检情况统计")
 	@RequestMapping(value = "/countMonthNew", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
@@ -112,7 +110,7 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 		List<String> forNum=new ArrayList<>();
 		List<String> proNum=new ArrayList<>();
 		for (HashMap<String, Object> stringObjectHashMap : countList) {
-			axisData.add(stringObjectHashMap.get("checkDate").toString());
+			axisData.add(stringObjectHashMap.get("checkDate").toString().substring(5));
 			actualNum.add(stringObjectHashMap.get("actualNum").toString());
 			forNum.add(stringObjectHashMap.get("forNum").toString());
 			proNum.add(stringObjectHashMap.get("proNum").toString());
@@ -121,20 +119,34 @@ public class SafetyPreCtrlController extends AbstractBaseController {
 		List<HashMap<String, Object>> seriesData=new ArrayList<>();
 		HashMap<String, Object> actualNummap=new HashMap<>();
 		actualNummap.put("data",actualNum);
+		actualNummap.put("name","计划巡检次数");
 		HashMap<String, Object> forNummap=new HashMap<>();
 		forNummap.put("data",forNum);
+		forNummap.put("name","漏检次数");
 		HashMap<String, Object> proNummap=new HashMap<>();
 		proNummap.put("data",proNum);
+		proNummap.put("name","实际巡检次数");
 		seriesData.add(proNummap);
 		seriesData.add(forNummap);
 		seriesData.add(actualNummap);
+
+		List<String> legend=new ArrayList<>();
+		legend.add("计划巡检次数");
+		legend.add("漏检次数");
+		legend.add("实际巡检次数");
+
 		HashMap<String, Object> date=new HashMap<>();
 		date.put("seriesData",seriesData);
 		date.put("axisData",axisData);
+		date.put("legend",legend);
 		HashMap<String, Object> temph = new HashMap<>();
 		temph.put("result",date);
 		temph.put("status",200);
 		temph.put("message","");
+
+
+
+
 		return temph;
 	}