修改

operation_manager/src/main/java/com/huaxu/order/controller/WorkOrderStatisticsController.java

@@ -174,8 +174,10 @@ public class WorkOrderStatisticsController {
         } else if (type == 1) {
             statistics = workOrderManageService.eventYearStatistics(workOrderManageDto);
         }
+        int seq=0;
         DecimalFormat df = new DecimalFormat("#0.00");
         for(Map<String,Object> map : statistics){
+            seq++;
             double number = 0;
             if(maintainerCount > 0){
                 number = Double.parseDouble(map.get("数量").toString())/maintainerCount;
@@ -183,6 +185,7 @@ public class WorkOrderStatisticsController {
             Map<String,Object> data = new HashMap<>();
             data.put("日期",map.get("日期"));
             data.put("数量",df.format(number));
+            data.put("序号",seq);
             average.add(data);
         }
         result.put("事件数量",statistics);

operation_manager/src/main/java/com/huaxu/order/service/impl/WorkOrderManageServiceImpl.java

@@ -223,7 +223,20 @@ public class WorkOrderManageServiceImpl implements WorkOrderManageService {
 
     @Override
     public List<StatisticsDto> orderStatusStatistics(WorkOrderManageDto workOrderManageDto) {
-        return workOrderManageMapper.orderStatusStatistics(workOrderManageDto);
+        List<StatisticsDto> result = new ArrayList<StatisticsDto>();
+        List<StatisticsDto> list = workOrderManageMapper.orderStatusStatistics(workOrderManageDto);
+        for(int i=1;i<=5;i++){
+            StatisticsDto statisticsDto = new StatisticsDto();
+            statisticsDto.setStatisticsName(String.valueOf(i));
+            statisticsDto.setStatisticsValue(0.0);
+            result.add(statisticsDto);
+        }
+        for(int i=0;i<list.size();i++){
+            StatisticsDto statisticsDto = list.get(i);
+            StatisticsDto statisticsDto1 = result.get(Integer.parseInt(statisticsDto.getStatisticsName())-1);
+            statisticsDto1.setStatisticsValue(statisticsDto.getStatisticsValue());
+        }
+        return result;
     }
 
     @Override

operation_manager/src/main/resources/mapper/task/PlanManageMapper.xml

@@ -639,7 +639,6 @@
       </if>
     </if>
   </select>
-
   <select id="selectTaskChangeTrend" resultType="com.huaxu.task.dto.TaskChangeTendDto" >
     select
       tab1.dateCreate,

sms_water/src/main/java/com/huaxu/controller/SceneController.java

@@ -209,4 +209,13 @@ public class SceneController {
         sceneService.saveUpdateBatch(deviceScenes);
         return new AjaxMessage<>(ResultStatus.OK,1 );
     }
+
+    @RequestMapping(value = "/selectAlarmSceneAndDevice", method = RequestMethod.GET)
+    @ResponseBody
+    @ApiOperation(value = "场景及设备故障率")
+    public  AjaxMessage<List<SceneEntity>> selectAlarmSceneAndDevice(@ApiParam(value = "父级场景ID", required = false)@RequestParam(required = false) Long id) {
+        List<SceneEntity> sceneEntities = sceneService.findByParentId(id);
+        return new AjaxMessage<>(ResultStatus.OK, sceneEntities);
+    }
+
 }

sms_water/src/main/java/com/huaxu/dao/SceneMapper.java

@@ -46,5 +46,6 @@ public interface SceneMapper extends BaseMapper<SceneEntity> {
 
     List<Map<String,Object>> findSceneAmount(@Param("scene") SceneEntity sceneEntity,@Param("months") Integer months);
 
+    List<Map<String,Object>> selectAlarmSceneAndDevice(@Param("scene") SceneEntity sceneEntity, @Param("startDate") String startDate, @Param("endDate") String endDate);
     /**删除相关方法  使用mybatis-plus集成的 **/
 }

sms_water/src/main/java/com/huaxu/service/SceneService.java

@@ -445,4 +445,8 @@ public class SceneService extends ServiceImpl<SceneMapper, SceneEntity> {
         sceneEntity.setCompanyOrgId(companyOrgId);
         return sceneMapper.selectByTypeName(sceneEntity);
     }
+
+    List<Map<String,Object>> selectAlarmSceneAndDevice(SceneEntity sceneEntity, String startDate, String endDate){
+        return sceneMapper.selectAlarmSceneAndDevice(sceneEntity, startDate, endDate);
+    }
 }