巡检分析 巡检设备指标 详情

@@ -221,19 +221,19 @@ public class InspectionAnalysisController {
     @GetMapping("/getInspectionEquipIndicators")
     @GetMapping("/getInspectionEquipIndicators")
     public Result<InspectionEquipIndicatorsVO> getInspectionEquipIndicators(String startDate, String endDate){
     public Result<InspectionEquipIndicatorsVO> getInspectionEquipIndicators(String startDate, String endDate){
         Result<InspectionEquipIndicatorsVO> result = new Result<>();
         Result<InspectionEquipIndicatorsVO> result = new Result<>();
-        InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = inspectionAnalysisService.getInspectionEquipIndicatorsNew(startDate,endDate);
+        InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = inspectionAnalysisService.getInspectionEquipIndicators(startDate,endDate);
         result.setSuccess(true);
         result.setSuccess(true);
         result.setResult(inspectionEquipIndicatorsVO);
         result.setResult(inspectionEquipIndicatorsVO);
         return result;
         return result;
     }
     }
     @ApiOperation(value = "巡检分析-巡检设备指标-详情", notes = "巡检分析-巡检设备指标-详情")
     @ApiOperation(value = "巡检分析-巡检设备指标-详情", notes = "巡检分析-巡检设备指标-详情")
     @GetMapping("/getInspectionEquipIndicatorsDetail")
     @GetMapping("/getInspectionEquipIndicatorsDetail")
-    public Result<List<InspectionEquipIndicatorsDetailVO>> getInspectionEquipIndicators(String departId,String startDate, String endDate){
-        Result<List<InspectionEquipIndicatorsDetailVO>> result = new Result<>();
+    public Result<List<InspectionEquipIndicatorsVO>> getInspectionEquipIndicators(String departId,String startDate, String endDate){
+        Result<List<InspectionEquipIndicatorsVO>> result = new Result<>();
         if(StringUtils.isEmpty(departId)){
         if(StringUtils.isEmpty(departId)){
             departId = BaseContextHandler.getDeparts();
             departId = BaseContextHandler.getDeparts();
         }
         }
-        List<InspectionEquipIndicatorsDetailVO> dataList = inspectionAnalysisService.getInspectionEquipIndicatorsDetail(JSUtils.quoteEach(departId,","),startDate,endDate);
+        List<InspectionEquipIndicatorsVO> dataList = inspectionAnalysisService.getInspectionEquipIndicatorsDetail(JSUtils.quoteEach(departId,","),startDate,endDate);
         result.setSuccess(true);
         result.setSuccess(true);
         result.setResult(dataList);
         result.setResult(dataList);
         return result;
         return result;

@@ -43,7 +43,7 @@ public interface IInspectionAnalysisService {
      * @param endDate
      * @param endDate
      * @return
      * @return
      */
      */
-    List<InspectionEquipIndicatorsDetailVO>  getInspectionEquipIndicatorsDetail(String departIds,String startDate, String endDate);
+    List<InspectionEquipIndicatorsVO>  getInspectionEquipIndicatorsDetail(String departIds,String startDate, String endDate);
 
 
     /***
     /***
      * 巡检分析-巡检任务概况
      * 巡检分析-巡检任务概况

@@ -28,4 +28,6 @@ public class InspectionEquipIndicatorsVO {
     @ApiModelProperty(value = "异常项处理率")
     @ApiModelProperty(value = "异常项处理率")
     private String processedAbnormalRate;
     private String processedAbnormalRate;
 
 
+    private String departName;
+
 }
 }