Merge remote-tracking branch 'origin/master'

@@ -158,7 +158,7 @@ public class InspectionAnalysisController {
     @GetMapping("/getInspectionTaskIndicators")
     public Result<InspectionTaskIndicatorsVO> getInspectionTaskIndicators(String startDate,String endDate){
         Result<InspectionTaskIndicatorsVO> result = new Result<>();
-        InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = inspectionAnalysisService.getInspectionTaskIndicators(startDate,endDate);
+        InspectionTaskIndicatorsVO inspectionTaskIndicatorsVO = inspectionAnalysisService.getInspectionTaskIndicatorsNew(startDate,endDate);
         result.setSuccess(true);
         result.setResult(inspectionTaskIndicatorsVO);
         return result;
@@ -188,7 +188,7 @@ public class InspectionAnalysisController {
     @GetMapping("/getInspectionTaskOverview")
     public Result<InspectionTaskOverviewVO> getInspectionTaskOverview(String startDate, String endDate){
         Result<InspectionTaskOverviewVO> result = new Result<>();
-        InspectionTaskOverviewVO inspectionTaskIndicatorVO = inspectionAnalysisService.getInspectionTaskOverview(startDate,endDate);
+        InspectionTaskOverviewVO inspectionTaskIndicatorVO = inspectionAnalysisService.getInspectionTaskOverviewNew(startDate,endDate);
         result.setSuccess(true);
         result.setResult(inspectionTaskIndicatorVO);
         return result;
@@ -221,7 +221,7 @@ public class InspectionAnalysisController {
     @GetMapping("/getInspectionEquipIndicators")
     public Result<InspectionEquipIndicatorsVO> getInspectionEquipIndicators(String startDate, String endDate){
         Result<InspectionEquipIndicatorsVO> result = new Result<>();
-        InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = inspectionAnalysisService.getInspectionEquipIndicators(startDate,endDate);
+        InspectionEquipIndicatorsVO inspectionEquipIndicatorsVO = inspectionAnalysisService.getInspectionEquipIndicatorsNew(startDate,endDate);
         result.setSuccess(true);
         result.setResult(inspectionEquipIndicatorsVO);
         return result;
@@ -251,7 +251,7 @@ public class InspectionAnalysisController {
     @GetMapping("/getInspectionEquipOverview")
     public Result<InspectionEquipOverviewVO> getInspectionEquipOverview(String startDate, String endDate){
         Result<InspectionEquipOverviewVO> result = new Result<>();
-        InspectionEquipOverviewVO inspectionEquipOverviewVO = inspectionAnalysisService.getInspectionEquipOverview(startDate,endDate);
+        InspectionEquipOverviewVO inspectionEquipOverviewVO = inspectionAnalysisService.getInspectionEquipOverviewNew(startDate,endDate);
         result.setSuccess(true);
         result.setResult(inspectionEquipOverviewVO);
         return result;

@@ -20,7 +20,7 @@ public interface IInspectionAnalysisService {
      * @return
      */
     InspectionTaskIndicatorsVO getInspectionTaskIndicators(String startDate, String endDate);
-
+    InspectionTaskIndicatorsVO getInspectionTaskIndicatorsNew(String startDate, String endDate);
     /***
      * 巡检分析-巡检任务指标-详情
      * @param departIds
@@ -36,7 +36,7 @@ public interface IInspectionAnalysisService {
      * @return
      */
     InspectionEquipIndicatorsVO getInspectionEquipIndicators(String startDate, String endDate);
-
+    InspectionEquipIndicatorsVO getInspectionEquipIndicatorsNew(String startDate, String endDate);
     /***
      * 巡检分析-巡检设备指标--详情
      * @param startDate
@@ -52,6 +52,7 @@ public interface IInspectionAnalysisService {
      * @return
      */
     InspectionTaskOverviewVO getInspectionTaskOverview(String startDate, String endDate);
+    InspectionTaskOverviewVO getInspectionTaskOverviewNew(String startDate, String endDate);
 
     /***
      * 巡检分析-巡检任务概况
@@ -69,6 +70,8 @@ public interface IInspectionAnalysisService {
      */
     InspectionEquipOverviewVO getInspectionEquipOverview(String startDate, String endDate);
 
+    InspectionEquipOverviewVO getInspectionEquipOverviewNew(String startDate, String endDate);
+
     /***
      * 巡检分析-巡检设备概况-详情
      * @param departIds