Merge remote-tracking branch 'origin/master'

src/main/java/com/aoyang/tms/entity/WorkCycle.java

@@ -159,5 +159,9 @@ public class WorkCycle implements Serializable {
     @TableField("update_date")
     private LocalDateTime updateDate;
 
+    @ApiModelProperty(value = "总共公里数(导出用)")
+    @TableField(exist = false)
+    private Integer sumKilometre;
+
 
 }

src/main/java/com/aoyang/tms/service/impl/JxlsExportTestServiceImpl.java

@@ -51,6 +51,7 @@ public class JxlsExportTestServiceImpl implements JxlsExportTestService {
         WorkLogTplVO workLogTplVO = new WorkLogTplVO();
 
         WorkCycle workCycle = workCycleService.getById(param.getCycleId());
+        workCycle.setSumKilometre(workCycle.getEndTrip()-workCycle.getStartTrip());
         param.setTruckId(workCycle.getTruckId());
         workLogTplVO.setWorkCycle(workCycle);
         workLogTplVO.setBetweenTime(DateUtils.betweenTime(workCycle.getStartTime(), workCycle.getEndTime()));