Merge remote-tracking branch 'origin/master' into master

@@ -90,11 +90,11 @@ public class SysCommandCentreController {
     @ApiOperation(value="指挥中心-运行负荷率分析", notes="指挥中心-运行负荷率分析")
     //指挥中心-运行负荷率分析
     @GetMapping(value = "/statisticsByLoadRate")
-    public Result<DepartLoadRateResultVO >  statisticsByLoadRate(String startTime , String endTime,Integer loadRateType) throws Exception {
+    public Result<DepartLoadRateResultVO >  statisticsByLoadRate(String startDate , String endTime,Integer loadRateType) throws Exception {
         Result<DepartLoadRateResultVO > result = new Result<>();
         String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
         if(loadRateType == null ) loadRateType = 1;
-        DepartLoadRateResultVO departLoadRateResultVO = reportItemvService.statisticsByLoadRate( departIds,startTime ,  endTime, loadRateType);
+        DepartLoadRateResultVO departLoadRateResultVO = reportItemvService.statisticsByLoadRate( departIds,startDate ,  endTime, loadRateType);
         result.setSuccess(true);
         result.setResult(departLoadRateResultVO);
         return result;
@@ -105,10 +105,10 @@ public class SysCommandCentreController {
     @ApiOperation(value="指挥中心-运行负荷率分析---列表详情", notes="指挥中心-运行负荷率分析----列表详情")
     //指挥中心-运行负荷率分析
     @GetMapping(value = "/statisticsByLoadRateList")
-    public Result< List<DepartLoadRateVO> >  statisticsByLoadRateList(String startTime , String endTime) throws Exception {
+    public Result< List<DepartLoadRateVO> >  statisticsByLoadRateList(String startDate , String endDate) throws Exception {
         Result< List<DepartLoadRateVO> > result = new Result<>();
         String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
-        List<DepartLoadRateVO> departLoadRateResultVO = reportItemvService.statisticsByLoadRateList( departIds,startTime ,  endTime,null);
+        List<DepartLoadRateVO> departLoadRateResultVO = reportItemvService.statisticsByLoadRateList( departIds,startDate ,  endDate,null);
         result.setSuccess(true);
         result.setResult(departLoadRateResultVO);
         return result;
@@ -119,10 +119,10 @@ public class SysCommandCentreController {
     @AutoLog(value = "指挥中心-泥量统计")
     @ApiOperation(value="指挥中心-泥量统计", notes="指挥中心-泥量统计")
     @GetMapping(value = "/statisticsByCement")
-    public Result<List<FRportlCommandCenterVO>> statisticsByCement(String startTime , String endTime) throws Exception {
+    public Result<List<FRportlCommandCenterVO>> statisticsByCement(String startDate , String endDate) throws Exception {
         Result<List<FRportlCommandCenterVO>> result = new Result();
         String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
-        List<FRportlCommandCenterVO> dataList =  reportItemvService.statisticsByCement(departIds,startTime,endTime);
+        List<FRportlCommandCenterVO> dataList =  reportItemvService.statisticsByCement(departIds,startDate,endDate);
         result.setResult(dataList  );
         return result;
     }
@@ -130,10 +130,10 @@ public class SysCommandCentreController {
     @ApiOperation(value="指挥中心-泥量统计--详情列表", notes="指挥中心-泥量统计--详情列表")
     //指挥中心-泥量统计--详情列表
     @GetMapping(value = "/statisticsByCementList")
-    public Result<List<ReportItemVO>> statisticsByCementList(String startTime , String endTime) throws Exception {
+    public Result<List<ReportItemVO>> statisticsByCementList(String startDate , String endDate) throws Exception {
         Result<List<ReportItemVO>> result = new Result();
         String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
-        List<ReportItemVO> dataList =  reportItemvService.statisticsByCementList(departIds,startTime,endTime);
+        List<ReportItemVO> dataList =  reportItemvService.statisticsByCementList(departIds,startDate,endDate);
         result.setResult(dataList  );
         return result;
     }
@@ -143,20 +143,20 @@ public class SysCommandCentreController {
     @AutoLog(value = "指挥中心-能耗分析")
     @ApiOperation(value="指挥中心-能耗分析", notes="指挥中心-能耗分析")
     @GetMapping(value = "/statisticsByElectricity")
-    public Result<List<FRportlCommandCenterVO>> statisticsByElectricity(String startTime ,String endTime) throws Exception {
+    public Result<List<FRportlCommandCenterVO>> statisticsByElectricity(String startDate ,String endDate) throws Exception {
         Result<List<FRportlCommandCenterVO>> result = new Result();
         String departId = "1818214519948836864,1711662624459804674";
-        List<FRportlCommandCenterVO> dataList =  reportItemvService.statisticsByElectricity(departId,startTime,endTime);
+        List<FRportlCommandCenterVO> dataList =  reportItemvService.statisticsByElectricity(departId,startDate,endDate);
         result.setResult(dataList  );
         return result;
     }
     @AutoLog(value = "指挥中心-能耗分析")
     @ApiOperation(value="指挥中心-能耗分析--详情列表", notes="指挥中心-能耗分析--详情列表")
     @GetMapping(value = "/statisticsByElectricityList")
-    public Result<List<ReportItemVO>> statisticsByElectricityList(String startTime ,String endTime) throws Exception {
+    public Result<List<ReportItemVO>> statisticsByElectricityList(String startDate ,String endDate) throws Exception {
         Result<List<ReportItemVO>> result = new Result();
         String departIds = BaseContextHandler.getDeparts();//1818214519948836864,1711662624459804674
-        List<ReportItemVO> dataList =  reportItemvService.statisticsByElectricityList(departIds,startTime,endTime);
+        List<ReportItemVO> dataList =  reportItemvService.statisticsByElectricityList(departIds,startDate,endDate);
         result.setResult(dataList  );
         return result;
     }