修改车辆轨迹查询

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/model/TaskStatisticsVo.java

@@ -82,4 +82,8 @@ public class TaskStatisticsVo implements Serializable {
      * 上月初到上个月某个时间点的累计卸货吨数
      */
     private String unloadTonBeforeMonth;
+    /**
+     * 卸货吨数增长或者下降占比
+     */
+    private String unloadTonPercentChange;
 }

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwfTaskService.java

@@ -72,18 +72,22 @@ public class KwfTaskService {
         //计算上月卸货吨数
         double unloadTon = getUnloadTon(waybillOrder);
 
-        //获取本月初到当前时间的数据
+        //获取本月初到当前时间的数据(卸货吨数)
         double unloadTonThisMonth = getUnloadTonThisMonth(waybillOrder);
-        //获取上个月初到某个时间点的数据
+        //获取上个月初到某个时间点的数据(卸货吨数)
         double unloadTonBeforeMonth = getUnloadTonBeforeMonth(waybillOrder);
+        //较上个月同比增长或者下降
+        double unloadGrowthRate = (unloadTonBeforeMonth - unloadTonThisMonth) / unloadTonBeforeMonth * 100;
         // 计算增长率
         double growthRate = (double) (yesterdayTaskCount - taskTotalBeforeYesterday) / taskTotalBeforeYesterday * 100;
         return getTaskStatisticsVo(totalCount, taskingCount, completedCount, yesterdayTaskCount,
-                taskTotalBeforeYesterday, growthRate, unloadTon, unloadTonThisMonth, unloadTonBeforeMonth);
+                taskTotalBeforeYesterday, growthRate, unloadTon, unloadTonThisMonth, unloadTonBeforeMonth,unloadGrowthRate);
     }
 
 
-    private TaskStatisticsVo getTaskStatisticsVo(int totalCount, long taskingCount, long completedCount, long yesterdayTaskCount, long taskTotalBeforeYesterday, double growthRate, double unloadTon, double unloadTonThisMonth, double unloadTonBeforeMonth) {
+    private TaskStatisticsVo getTaskStatisticsVo(int totalCount, long taskingCount, long completedCount
+            , long yesterdayTaskCount, long taskTotalBeforeYesterday, double growthRate, double unloadTon
+            , double unloadTonThisMonth, double unloadTonBeforeMonth,double unloadGrowthRate) {
         TaskStatisticsVo taskStatisticsVo = new TaskStatisticsVo();
         taskStatisticsVo.setTaskTotal(String.valueOf(totalCount));
         taskStatisticsVo.setTaskRunning(String.valueOf(taskingCount));
@@ -100,6 +104,7 @@ public class KwfTaskService {
         taskStatisticsVo.setWaybillTotalYesterday(String.valueOf(yesterdayTaskCount));
         taskStatisticsVo.setWaybillTotalBeforeYesterday(String.valueOf(taskTotalBeforeYesterday));
         taskStatisticsVo.setWaybillPercentChange(String.format("%.2f", growthRate));
+        taskStatisticsVo.setUnloadTonPercentChange(String.format("%.2f", unloadGrowthRate));
         return taskStatisticsVo;
     }