司机上报

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportSendAddressSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportSendAddressSaveParam {
+
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "拉运状态：1可以拉运 2不可用拉运", example = "1")
+    @NotNull(message = "拉运状态不能为空")
+    private Integer reportStatus;
+    @ApiModelProperty(value = "状态：1有存煤 2现产现装", example = "1")
+    private Integer status;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTrafficCongestionSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTrafficCongestionSaveParam {
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "详细地址", example = "北京路1号")
+    private String address;
+
+    @ApiModelProperty(value = "预计拥堵时长（小时）", example = "1.5")
+    private BigDecimal jamTime;
+    @ApiModelProperty(value = "现场照片列表")
+    private List<String> jamImageList;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckLeaveSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckLeaveSaveParam {
+
+    @ApiModelProperty(value = "请假开始时间")
+    @NotBlank(message = "请假开始时间不能为空")
+    private String beginTime;
+    @ApiModelProperty(value = "请假结束时间")
+    @NotBlank(message = "请假结束时间不能为空")
+    private String endTime;
+    @ApiModelProperty(value = "请假原因")
+    @NotBlank(message = "请假原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckLocationSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckLocationSaveParam {
+
+    @ApiModelProperty(value = "车牌号", example = "京A12345")
+    @NotBlank(message = "车牌号不能为空")
+    private String truckNo;
+
+    @ApiModelProperty(value = "车辆出车状态 1:空车 2:运单-空车 3:运单-重车", example = "1")
+    @NotNull(message = "车辆出车状态不能空")
+    private Integer truckOrderStatus;
+
+    @ApiModelProperty(value = "经度")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度")
+    private BigDecimal latitude;
+
+    @ApiModelProperty(value = "详细地址", example = "北京路1号")
+    private String address;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectTruckRefuelSaveParam.java

+package com.clx.performance.param.app.collect;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectTruckRefuelSaveParam {
+
+    @ApiModelProperty(value = "运单编号", example = "10000000000")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "装车油表图片列表")
+    @NotEmpty(message = "装车油表图片不能为空")
+    private List<String> loadImageList;
+    @ApiModelProperty(value = "卸车油表图片列表")
+    @NotEmpty(message = "卸车油表图片不能为空")
+    private List<String> unloadImageList;
+
+    @ApiModelProperty(value = "装车油量", example = "1.23")
+    private BigDecimal loadOil;
+    @ApiModelProperty(value = "卸车油量", example = "1.23")
+    private BigDecimal unloadOil;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectLineReportParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectLineReportParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTraficCongestionParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectTraficCongestionParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckLeaveParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectTruckLeaveParam extends PageParam {
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckLocationParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectTruckLocationParam extends PageParam {
+
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/PageCollectTruckRefuelParam.java

+package com.clx.performance.param.app.collect;
+
+import com.msl.common.base.PageParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+@Getter
+@Setter
+@NoArgsConstructor
+@ToString
+public class PageCollectTruckRefuelParam extends PageParam {
+
+    @ApiModelProperty(value = "用户编号", hidden = true)
+    private Long userNo;
+}

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectLineReportVO.java

+package com.clx.performance.vo.app.collect;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+/**
+* @Author: aiqinguo
+* @Description: 线路信息上报
+* @Date: 2023/10/16 13:06:26
+* @Version: 1.0
+*/
+
+@ApiModel(description = "线路信息上报")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectLineReportVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "地址id", example = "")
+    private Integer addressId;
+    @ApiModelProperty(value = "详细地址", example = "")
+    private String address;
+    @ApiModelProperty(value = "类型：1 发货地 2 目的地", example = "")
+    private Integer type;
+    @ApiModelProperty(value = "上报类型：1：货源地情况\r\n   2:无法到达货源地 3:无法装货 4：无法到达目的地 4：运单取消 5：没有接单\r\n  6：装车异常 7：卸车异常", example = "")
+    private Integer reportType;
+    @ApiModelProperty(value = "拉运状态 1: 正常 2：异常", example = "")
+    private Integer reportStatus;
+    @ApiModelProperty(value = "状态描述", example = "")
+    private String remark;
+    @ApiModelProperty(value = "上报图片", example = "")
+    private String image;
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTrafficCongestionVO.java

+package com.clx.performance.vo.app.collect;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 道路拥堵情况
+* @Date: 2023/10/16 13:06:26
+* @Version: 1.0
+*/
+
+@ApiModel(description = "道路拥堵情况")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTrafficCongestionVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "省", example = "")
+    private String province;
+    @ApiModelProperty(value = "市", example = "")
+    private String city;
+    @ApiModelProperty(value = "区县", example = "")
+    private String county;
+    @ApiModelProperty(value = "乡镇", example = "")
+    private String town;
+    @ApiModelProperty(value = "街道", example = "")
+    private String street;
+    @ApiModelProperty(value = "详细地址", example = "")
+    private String address;
+    @ApiModelProperty(value = "经度", example = "")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度", example = "")
+    private BigDecimal latitude;
+    @ApiModelProperty(value = "预计拥堵时长", example = "")
+    private BigDecimal jamTime;
+    @ApiModelProperty(value = "现场照片", example = "")
+    private String jamImage;
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTruckLeaveVO.java

+package com.clx.performance.vo.app.collect;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 司机请假表
+* @Date: 2023/10/16 13:06:26
+* @Version: 1.0
+*/
+
+@ApiModel(description = "司机请假表")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTruckLeaveVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "请假开始时间", example = "")
+    private String beginTime;
+    @ApiModelProperty(value = "请假结束时间", example = "")
+    private String endTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTruckLocationVO.java

+package com.clx.performance.vo.app.collect;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 车辆位置上报
+* @Date: 2023/10/16 13:06:26
+* @Version: 1.0
+*/
+
+@ApiModel(description = "车辆位置上报")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTruckLocationVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "省", example = "")
+    private String province;
+    @ApiModelProperty(value = "市", example = "")
+    private String city;
+    @ApiModelProperty(value = "区县", example = "")
+    private String county;
+    @ApiModelProperty(value = "乡镇", example = "")
+    private String town;
+    @ApiModelProperty(value = "街道", example = "")
+    private String street;
+    @ApiModelProperty(value = "详细地址", example = "")
+    private String address;
+    @ApiModelProperty(value = "经度", example = "")
+    private BigDecimal longitude;
+    @ApiModelProperty(value = "纬度", example = "")
+    private BigDecimal latitude;
+    @ApiModelProperty(value = "车辆出车状态 1:空车 2:运单-空车 3:运单-重车", example = "")
+    private Integer truckOrderStatus;
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTruckRefuelVO.java

+package com.clx.performance.vo.app.collect;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+
+/**
+* @Author: aiqinguo
+* @Description: 油表上报信息
+* @Date: 2023/10/16 13:06:27
+* @Version: 1.0
+*/
+
+@ApiModel(description = "油表上报信息")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTruckRefuelVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "发货所在详细地址", example = "")
+    private String sendAddress;
+    @ApiModelProperty(value = "收货所在详细地址", example = "")
+    private String receiveAddress;
+    @ApiModelProperty(value = "装车油表list集合", example = "")
+    private String loadImage;
+    @ApiModelProperty(value = "装车油量", example = "")
+    private BigDecimal loadOil;
+    @ApiModelProperty(value = "卸车油表list集合", example = "")
+    private String unloadImage;
+    @ApiModelProperty(value = "卸车油量", example = "")
+    private BigDecimal unloadOil;
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectTruckWaitVO.java

+package com.clx.performance.vo.app.collect;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+/**
+* @Author: aiqinguo
+* @Description: 线路排队耗时
+* @Date: 2023/10/16 13:06:27
+* @Version: 1.0
+*/
+
+@ApiModel(description = "线路排队耗时")
+@Getter
+@Setter
+@ToString
+@NoArgsConstructor
+public class CollectTruckWaitVO {
+
+    @ApiModelProperty(value = "id", example = "")
+    private Integer id;
+    @ApiModelProperty(value = "用户编号", example = "")
+    private Long userNo;
+    @ApiModelProperty(value = "用户姓名", example = "")
+    private String name;
+    @ApiModelProperty(value = "手机号码", example = "")
+    private String mobile;
+    @ApiModelProperty(value = "车牌号", example = "")
+    private String truckNo;
+    @ApiModelProperty(value = "运单编号", example = "")
+    private String childNo;
+    @ApiModelProperty(value = "地址id", example = "")
+    private Integer addressId;
+    @ApiModelProperty(value = "详细地址", example = "")
+    private String address;
+    @ApiModelProperty(value = "上报类型：1 装车类型 2卸车类型", example = "")
+    private Integer reportType;
+    @ApiModelProperty(value = "上报类型：1 需要排队 ", example = "")
+    private Integer waitType;
+    @ApiModelProperty(value = "预计站内等待时长", example = "")
+    private BigDecimal stationInTime;
+    @ApiModelProperty(value = "预计站内等待时长图片", example = "")
+    private String stationInImage;
+    @ApiModelProperty(value = "预计站外等待时长", example = "")
+    private BigDecimal stationOutTime;
+    @ApiModelProperty(value = "预计站外等待时长图片", example = "")
+    private String stationOutImage;
+    @ApiModelProperty(value = "上报时间", example = "")
+    private String reportTime;
+    @ApiModelProperty(value = "创建时间", example = "")
+    private String createTime;
+    @ApiModelProperty(value = "修改时间", example = "")
+    private String modifiedTime;
+
+}
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectLineReportController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectLineReportSendAddressSaveParam;
+import com.clx.performance.param.app.collect.PageCollectLineReportParam;
+import com.clx.performance.service.collect.CollectLineReportService;
+import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/line")
+@Validated
+@Api(tags = "APP-线路上报")
+@AllArgsConstructor
+public class AppDriverCollectLineReportController {
+
+    private final CollectLineReportService collectLineReportService;
+
+    @ApiOperation(value = "上报货源地情况", notes = "<br>By:艾庆国")
+    @PostMapping("/saveSendAddressReport")
+    public Result<Void> saveSendAddressReport(@RequestBody @Validated CollectLineReportSendAddressSaveParam param) {
+        collectLineReportService.saveSendAddressReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询线路上报详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<CollectLineReportVO> getReportInfo(Integer id) {
+
+        return Result.ok(collectLineReportService.getReportInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询线路上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageLineReport")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectLineReportVO>> pageLineReport(@RequestBody @Validated PageCollectLineReportParam param) {
+        IPage<CollectLineReportVO> page = collectLineReportService.pageLineReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTrafficCongestionController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.service.collect.CollectTrafficCongestionService;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/traffic")
+@Validated
+@Api(tags = "APP-交通上报")
+@AllArgsConstructor
+public class AppDriverCollectTrafficCongestionController {
+
+    private final CollectTrafficCongestionService collectTrafficCongestionService;
+
+    @ApiOperation(value = "上报交通", notes = "<br>By:艾庆国")
+    @PostMapping("/saveTrafficReport")
+    public Result<Void> saveTrafficReport(@RequestBody @Validated CollectTrafficCongestionSaveParam param) {
+        collectTrafficCongestionService.saveTrafficReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询交通上报详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<CollectTrafficCongestionVO> getReportInfo(Integer id) {
+
+        return Result.ok(collectTrafficCongestionService.getReportInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询交通上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageTrafficReport")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectTrafficCongestionVO>> pageTrafficReport(@RequestBody @Validated PageCollectTraficCongestionParam param) {
+        IPage<CollectTrafficCongestionVO> page = collectTrafficCongestionService.pageTrafficReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckLeaveController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.service.collect.CollectTruckLeaveService;
+import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/leave")
+@Validated
+@Api(tags = "APP-请假")
+@AllArgsConstructor
+public class AppDriverCollectTruckLeaveController {
+
+    private final CollectTruckLeaveService collectTruckLeaveService;
+
+    @ApiOperation(value = "新增请假", notes = "<br>By:艾庆国")
+    @PostMapping("/saveLeave")
+    public Result<Void> saveLeave(@RequestBody @Validated CollectTruckLeaveSaveParam param) {
+        collectTruckLeaveService.saveLeave(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询请假详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getInfo")
+    public Result<CollectTruckLeaveVO> getInfo(Integer id) {
+
+        return Result.ok(collectTruckLeaveService.getInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询请假列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageLeave")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectTruckLeaveVO>> pageLeave(@RequestBody @Validated PageCollectTruckLeaveParam param) {
+        IPage<CollectTruckLeaveVO> page = collectTruckLeaveService.pageLeave(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckLocationController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.service.collect.CollectTruckLocationService;
+import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/location")
+@Validated
+@Api(tags = "APP-位置上报")
+@AllArgsConstructor
+public class AppDriverCollectTruckLocationController {
+
+    private final CollectTruckLocationService collectTruckLocationService;
+
+    @ApiOperation(value = "上报位置", notes = "<br>By:艾庆国")
+    @PostMapping("/saveLocationReport")
+    public Result<Void> saveLocationReport(@RequestBody @Validated CollectTruckLocationSaveParam param) {
+        collectTruckLocationService.saveLocationReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询位置上报详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<CollectTruckLocationVO> getReportInfo(Integer id) {
+
+        return Result.ok(collectTruckLocationService.getReportInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询位置上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageLocationReport")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectTruckLocationVO>> pageLocationReport(@RequestBody @Validated PageCollectTruckLocationParam param) {
+        IPage<CollectTruckLocationVO> page = collectTruckLocationService.pageLocationReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectTruckRefuelController.java

+package com.clx.performance.controller.app;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.service.collect.CollectTruckRefuelService;
+import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.msl.common.base.PageData;
+import com.msl.common.convertor.aspect.UnitCovert;
+import com.msl.common.result.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+@Slf4j
+@RestController
+@RequestMapping(value="/app/driver/collect/refuel")
+@Validated
+@Api(tags = "APP-油表上报")
+@AllArgsConstructor
+public class AppDriverCollectTruckRefuelController {
+
+    private final CollectTruckRefuelService collectTruckRefuelService;
+
+    @ApiOperation(value = "上报油表", notes = "<br>By:艾庆国")
+    @PostMapping("/saveRefuelReport")
+    public Result<Void> saveRefuelReport(@RequestBody @Validated CollectTruckRefuelSaveParam param) {
+        collectTruckRefuelService.saveRefuelReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "查询油表上报详情", notes = "<br>By:艾庆国")
+    @GetMapping("/getReportInfo")
+    public Result<CollectTruckRefuelVO> getReportInfo(Integer id) {
+
+        return Result.ok(collectTruckRefuelService.getReportInfo(id));
+    }
+
+    @ApiOperation(value = "分页查询油表上报列表",notes = "<br>By:艾庆国")
+    @PostMapping("/pageRefuelReport")
+    @UnitCovert(param = false)
+    public Result<PageData<CollectTruckRefuelVO>> pageRefuelReport(@RequestBody @Validated PageCollectTruckRefuelParam param) {
+        IPage<CollectTruckRefuelVO> page = collectTruckRefuelService.pageRefuelReport(param);
+        return Result.page(page.getRecords(), page.getTotal(), page.getPages());
+    }
+
+}

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTrafficCongestionDao.java

 package com.clx.performance.dao.collect;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectTrafficCongestionMapper;
 import com.clx.performance.model.collect.CollectTrafficCongestion;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
 import com.msl.common.dao.BaseDao;
 
 /**
@@ -12,5 +15,6 @@ import com.msl.common.dao.BaseDao;
  */
 public interface CollectTrafficCongestionDao extends BaseDao<CollectTrafficCongestionMapper, CollectTrafficCongestion, Integer> {
 
+    IPage<CollectTrafficCongestionVO> pageTraffic(PageCollectTraficCongestionParam param);
 
 }

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckLeaveDao.java

 package com.clx.performance.dao.collect;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectTruckLeaveMapper;
 import com.clx.performance.model.collect.CollectTruckLeave;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
 import com.msl.common.dao.BaseDao;
 
 /**
@@ -12,5 +17,6 @@ import com.msl.common.dao.BaseDao;
  */
 public interface CollectTruckLeaveDao extends BaseDao<CollectTruckLeaveMapper, CollectTruckLeave, Integer> {
 
+    IPage<CollectTruckLeaveVO> pageLeave(PageCollectTruckLeaveParam param);
 
 }

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckLocationDao.java

 package com.clx.performance.dao.collect;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectTruckLocationMapper;
 import com.clx.performance.model.collect.CollectTruckLocation;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
 import com.msl.common.dao.BaseDao;
 
 /**
@@ -12,5 +17,6 @@ import com.msl.common.dao.BaseDao;
  */
 public interface CollectTruckLocationDao extends BaseDao<CollectTruckLocationMapper, CollectTruckLocation, Integer> {
 
+    IPage<CollectTruckLocationVO> pageLocation(PageCollectTruckLocationParam param);
 
 }

performance-web/src/main/java/com/clx/performance/dao/collect/CollectTruckRefuelDao.java

 package com.clx.performance.dao.collect;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectTruckRefuelMapper;
 import com.clx.performance.model.collect.CollectTruckRefuel;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
 import com.msl.common.dao.BaseDao;
 
 /**
@@ -12,5 +17,6 @@ import com.msl.common.dao.BaseDao;
  */
 public interface CollectTruckRefuelDao extends BaseDao<CollectTruckRefuelMapper, CollectTruckRefuel, Integer> {
 
+    IPage<CollectTruckRefuelVO> pageRefuel(PageCollectTruckRefuelParam param);
 
 }

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTrafficCongestionDaoImpl.java

 package com.clx.performance.dao.impl.collect;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.collect.CollectTrafficCongestionDao;
 import com.clx.performance.mapper.collect.CollectTrafficCongestionMapper;
 import com.clx.performance.model.collect.CollectTrafficCongestion;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.vo.app.OrderChildVO;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
@@ -15,4 +20,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class CollectTrafficCongestionDaoImpl extends BaseDaoImpl<CollectTrafficCongestionMapper, CollectTrafficCongestion, Integer> implements CollectTrafficCongestionDao {
 
+    @Override
+    public IPage<CollectTrafficCongestionVO> pageTraffic(PageCollectTraficCongestionParam param) {
+        Page<CollectTrafficCongestionVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageTraffic(page,param);
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckLeaveDaoImpl.java

 package com.clx.performance.dao.impl.collect;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.collect.CollectTruckLeaveDao;
 import com.clx.performance.mapper.collect.CollectTruckLeaveMapper;
 import com.clx.performance.model.collect.CollectTruckLeave;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
@@ -15,4 +20,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class CollectTruckLeaveDaoImpl extends BaseDaoImpl<CollectTruckLeaveMapper, CollectTruckLeave, Integer> implements CollectTruckLeaveDao {
 
+    @Override
+    public IPage<CollectTruckLeaveVO> pageLeave(PageCollectTruckLeaveParam param) {
+        Page<CollectTruckLeaveVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageLeave(page,param);
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckLocationDaoImpl.java

 package com.clx.performance.dao.impl.collect;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.collect.CollectTruckLocationDao;
 import com.clx.performance.mapper.collect.CollectTruckLocationMapper;
 import com.clx.performance.model.collect.CollectTruckLocation;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
@@ -15,4 +20,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class CollectTruckLocationDaoImpl extends BaseDaoImpl<CollectTruckLocationMapper, CollectTruckLocation, Integer> implements CollectTruckLocationDao {
 
+    @Override
+    public IPage<CollectTruckLocationVO> pageLocation(PageCollectTruckLocationParam param) {
+        Page<CollectTruckLocationVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageLocation(page,param);
+    }
 }

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectTruckRefuelDaoImpl.java

 package com.clx.performance.dao.impl.collect;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.collect.CollectTruckRefuelDao;
 import com.clx.performance.mapper.collect.CollectTruckRefuelMapper;
 import com.clx.performance.model.collect.CollectTruckRefuel;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
@@ -15,4 +19,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class CollectTruckRefuelDaoImpl extends BaseDaoImpl<CollectTruckRefuelMapper, CollectTruckRefuel, Integer> implements CollectTruckRefuelDao {
 
+    @Override
+    public IPage<CollectTruckRefuelVO> pageRefuel(PageCollectTruckRefuelParam param) {
+        Page<CollectTruckRefuelVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageRefuel(page,param);
+    }
 }

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectLineReportMapper.java

 package com.clx.performance.mapper.collect;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.collect.CollectLineReport;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.sqlProvider.collect.CollectTrafficCongestionProvider;
+import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
 
 /**
 * @Author: aiqinguo
@@ -13,5 +21,10 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface CollectLineReportMapper extends BaseMapper<CollectLineReport> {
+    /**
+     * @see CollectTrafficCongestionProvider#pageTraffic(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTraficCongestionParam)
+     */
+    @SelectProvider(type = CollectTrafficCongestionProvider.class, method = "pageTraffic")
+    IPage<CollectLineReportVO> pageTraffic(@Param("page") Page<CollectLineReportVO> page, @Param("param") PageCollectTraficCongestionParam param);
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTrafficCongestionMapper.java

 package com.clx.performance.mapper.collect;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.collect.CollectTrafficCongestion;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.sqlProvider.collect.CollectTrafficCongestionProvider;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
 
 /**
 * @Author: aiqinguo
@@ -13,5 +20,10 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface CollectTrafficCongestionMapper extends BaseMapper<CollectTrafficCongestion> {
+    /**
+     * @see CollectTrafficCongestionProvider#pageTraffic(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTraficCongestionParam)
+     */
+    @SelectProvider(type = CollectTrafficCongestionProvider.class, method = "pageTraffic")
+    IPage<CollectTrafficCongestionVO> pageTraffic(@Param("page") Page<CollectTrafficCongestionVO> page, @Param("param") PageCollectTraficCongestionParam param);
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTruckLeaveMapper.java

 package com.clx.performance.mapper.collect;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.collect.CollectLineReport;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.collect.CollectTruckLeave;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.sqlProvider.collect.CollectTruckLeaveProvider;
+import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
 
 /**
 * @Author: aiqinguo
@@ -14,5 +20,10 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface CollectTruckLeaveMapper extends BaseMapper<CollectTruckLeave> {
+    /**
+     * @see CollectTruckLeaveProvider#pageLeave(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTruckLeaveParam)
+     */
+    @SelectProvider(type = CollectTruckLeaveProvider.class, method = "pageLeave")
+    IPage<CollectTruckLeaveVO> pageLeave(@Param("page") Page<CollectTruckLeaveVO> page, @Param("param") PageCollectTruckLeaveParam param);
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTruckLocationMapper.java

 package com.clx.performance.mapper.collect;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.collect.CollectLineReport;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.collect.CollectTruckLocation;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.sqlProvider.collect.CollectTruckLocationProvider;
+import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
 
 /**
 * @Author: aiqinguo
@@ -14,5 +20,10 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface CollectTruckLocationMapper extends BaseMapper<CollectTruckLocation> {
+    /**
+     * @see CollectTruckLocationProvider#pageLocation(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTruckLocationParam)
+     */
+    @SelectProvider(type = CollectTruckLocationProvider.class, method = "pageLocation")
+    IPage<CollectTruckLocationVO> pageLocation(@Param("page") Page<CollectTruckLocationVO> page, @Param("param") PageCollectTruckLocationParam param);
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTruckRefuelMapper.java

 package com.clx.performance.mapper.collect;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.collect.CollectLineReport;
 import com.clx.performance.model.collect.CollectTruckRefuel;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.sqlProvider.collect.CollectTrafficCongestionProvider;
+import com.clx.performance.sqlProvider.collect.CollectTruckRefuelProvider;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
 
 /**
 * @Author: aiqinguo
@@ -14,5 +24,10 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface CollectTruckRefuelMapper extends BaseMapper<CollectTruckRefuel> {
+    /**
+     * @see CollectTruckRefuelProvider#pageRefuel(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTruckRefuelParam)
+     */
+    @SelectProvider(type = CollectTruckRefuelProvider.class, method = "pageRefuel")
+    IPage<CollectTruckRefuelVO> pageRefuel(@Param("page") Page<CollectTruckRefuelVO> page, @Param("param") PageCollectTruckRefuelParam param);
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/mapper/collect/CollectTruckWaitMapper.java

 package com.clx.performance.mapper.collect;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.clx.performance.model.collect.CollectLineReport;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.model.collect.CollectTruckWait;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.sqlProvider.collect.CollectTrafficCongestionProvider;
+import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.SelectProvider;
 
 /**
 * @Author: aiqinguo
@@ -14,5 +20,10 @@ import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface CollectTruckWaitMapper extends BaseMapper<CollectTruckWait> {
+    /**
+     * @see CollectTrafficCongestionProvider#pageTraffic(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTraficCongestionParam)
+     */
+    @SelectProvider(type = CollectTrafficCongestionProvider.class, method = "pageTraffic")
+    IPage<CollectTruckWaitVO> pageTraffic(@Param("page") Page<CollectTruckWaitVO> page, @Param("param") PageCollectTraficCongestionParam param);
 
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/collect/CollectLineReport.java

@@ -3,14 +3,14 @@ package com.clx.performance.model.collect;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.clx.performance.enums.DriverTruckEnum;
 import com.msl.common.config.KeyColumn;
 import com.msl.common.model.HasKey;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-import lombok.ToString;
+import lombok.*;
 
 import java.time.LocalDateTime;
+import java.util.Arrays;
+import java.util.Optional;
 
 /**
 * @Author: aiqinguo
@@ -49,4 +49,42 @@ public class CollectLineReport implements HasKey<Integer> {
         return id;
     }
 
+    @Getter
+    @AllArgsConstructor
+    public enum Type {
+        SEND(1, "发货地"),
+        RECEIVE(2, "目的地");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<Type> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
+    @Getter
+    @AllArgsConstructor
+    public enum ReportType {
+        SEND(1, "货源地情况"),
+        RECEIVE(2, "目的地");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<ReportType> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+    @Getter
+    @AllArgsConstructor
+    public enum ReportStatus {
+        NORMAL(1, "正常"),
+        ABNORMAL(2, "异常");
+        private final Integer code;
+        private final String msg;
+
+        public static Optional<ReportStatus> getByCode(int code) {
+            return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
+        }
+    }
+
 }
\ No newline at end of file

performance-web/src/main/java/com/clx/performance/model/collect/CollectTruckLeave.java

@@ -33,6 +33,7 @@ public class CollectTruckLeave implements HasKey<Integer> {
     private String truckNo;                         //车牌号
     private LocalDateTime beginTime;                //请假开始时间
     private LocalDateTime endTime;                  //请假结束时间
+    private String remark;                          //请假原因
     private LocalDateTime createTime;               //创建时间
     private LocalDateTime modifiedTime;             //修改时间
 

performance-web/src/main/java/com/clx/performance/service/collect/CollectLineReportService.java

+package com.clx.performance.service.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectLineReportSendAddressSaveParam;
+import com.clx.performance.param.app.collect.PageCollectLineReportParam;
+import com.clx.performance.vo.app.collect.CollectLineReportVO;
+
+public interface CollectLineReportService {
+
+    void saveSendAddressReport(CollectLineReportSendAddressSaveParam param);
+
+    CollectLineReportVO getReportInfo(Integer id);
+
+    IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam param);
+
+}

performance-web/src/main/java/com/clx/performance/service/collect/CollectTrafficCongestionService.java

+package com.clx.performance.service.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+
+public interface CollectTrafficCongestionService {
+
+    void saveTrafficReport(CollectTrafficCongestionSaveParam param);
+
+    CollectTrafficCongestionVO getReportInfo(Integer id);
+
+    IPage<CollectTrafficCongestionVO> pageTrafficReport(PageCollectTraficCongestionParam param);
+
+}

performance-web/src/main/java/com/clx/performance/service/collect/CollectTruckLeaveService.java

+package com.clx.performance.service.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+
+public interface CollectTruckLeaveService {
+
+    void saveLeave(CollectTruckLeaveSaveParam param);
+
+    CollectTruckLeaveVO getInfo(Integer id);
+
+    IPage<CollectTruckLeaveVO> pageLeave(PageCollectTruckLeaveParam param);
+
+}

performance-web/src/main/java/com/clx/performance/service/collect/CollectTruckLocationService.java

+package com.clx.performance.service.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+
+public interface CollectTruckLocationService {
+
+    void saveLocationReport(CollectTruckLocationSaveParam param);
+
+    CollectTruckLocationVO getReportInfo(Integer id);
+
+    IPage<CollectTruckLocationVO> pageLocationReport(PageCollectTruckLocationParam param);
+
+}

performance-web/src/main/java/com/clx/performance/service/collect/CollectTruckRefuelService.java

+package com.clx.performance.service.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+
+public interface CollectTruckRefuelService {
+
+    void saveRefuelReport(CollectTruckRefuelSaveParam param);
+
+    CollectTruckRefuelVO getReportInfo(Integer id);
+
+    IPage<CollectTruckRefuelVO> pageRefuelReport(PageCollectTruckRefuelParam param);
+
+
+}

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectLineReportServiceImpl.java

+package com.clx.performance.service.impl.collect;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.collect.CollectLineReportDao;
+import com.clx.performance.dao.collect.CollectTrafficCongestionDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.collect.CollectLineReport;
+import com.clx.performance.model.collect.CollectTrafficCongestion;
+import com.clx.performance.param.app.collect.CollectLineReportSendAddressSaveParam;
+import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
+import com.clx.performance.param.app.collect.PageCollectLineReportParam;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.service.collect.CollectLineReportService;
+import com.clx.performance.service.collect.CollectTrafficCongestionService;
+import com.clx.performance.struct.collect.CollectLineReportStruct;
+import com.clx.performance.struct.collect.CollectTrafficCongestionStruct;
+import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@Service
+public class CollectLineReportServiceImpl implements CollectLineReportService {
+
+    @Autowired
+    private CollectLineReportDao collectLineReportDao;
+    @Autowired
+    private OrderChildDao orderChildDao;
+
+    @Autowired
+    private CollectLineReportStruct collectLineReportStruct;
+
+
+    @Override
+    public void saveSendAddressReport(CollectLineReportSendAddressSaveParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+        CollectLineReport collectLineReport = new CollectLineReport();
+        collectLineReport.setUserNo(userNo);
+        collectLineReport.setName(loginUserInfo.getUserName());
+        collectLineReport.setMobile(loginUserInfo.getUserMobile());
+        collectLineReport.setTruckNo("");
+
+        collectLineReport.setChildNo(param.getChildNo());
+        collectLineReport.setAddressId(orderChild.getSendAddressId());
+        collectLineReport.setAddress(orderChild.getSendAddress());
+
+        collectLineReport.setType(CollectLineReport.Type.SEND.getCode());
+        collectLineReport.setReportType(CollectLineReport.ReportType.SEND.getCode());
+
+        collectLineReport.setReportStatus(param.getReportStatus());
+        collectLineReport.setRemark(param.getStatus()==1? "有存煤" : "现产现装");
+        collectLineReport.setReportTime(LocalDateTime.now());
+        collectLineReportDao.saveEntity(collectLineReport);
+    }
+
+    @Override
+    public CollectLineReportVO getReportInfo(Integer id) {
+        return collectLineReportDao.getEntityByKey(id).map(collectLineReportStruct::convert).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+    }
+
+    @Override
+    public IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        param.setUserNo(userNo);
+        return null;
+    }
+}

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTrafficCongestionServiceImpl.java

+package com.clx.performance.service.impl.collect;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.collect.CollectTrafficCongestionDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.collect.CollectTrafficCongestion;
+import com.clx.performance.param.app.collect.CollectTrafficCongestionSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.service.collect.CollectTrafficCongestionService;
+import com.clx.performance.struct.collect.CollectTrafficCongestionStruct;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@Service
+public class CollectTrafficCongestionServiceImpl implements CollectTrafficCongestionService {
+
+    @Autowired
+    private CollectTrafficCongestionDao collectTrafficCongestionDao;
+
+    @Autowired
+    private CollectTrafficCongestionStruct collectTrafficCongestionStruct;
+
+
+    @Override
+    public void saveTrafficReport(CollectTrafficCongestionSaveParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        CollectTrafficCongestion collectTrafficCongestion = new CollectTrafficCongestion();
+        collectTrafficCongestion.setUserNo(userNo);
+        collectTrafficCongestion.setName(loginUserInfo.getUserName());
+        collectTrafficCongestion.setMobile(loginUserInfo.getUserMobile());
+
+        collectTrafficCongestion.setTruckNo("");
+
+        collectTrafficCongestion.setLongitude(param.getLongitude());
+        collectTrafficCongestion.setLatitude(param.getLatitude());
+        collectTrafficCongestion.setAddress(param.getAddress());
+
+        collectTrafficCongestion.setJamTime(param.getJamTime());
+        collectTrafficCongestion.setJamImage(JSON.toJSONString(param.getJamImageList()));
+        collectTrafficCongestion.setReportTime(LocalDateTime.now());
+        collectTrafficCongestionDao.saveEntity(collectTrafficCongestion);
+    }
+
+    @Override
+    public CollectTrafficCongestionVO getReportInfo(Integer id) {
+        return collectTrafficCongestionDao.getEntityByKey(id).map(collectTrafficCongestionStruct::convert).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+    }
+
+    @Override
+    public IPage<CollectTrafficCongestionVO> pageTrafficReport(PageCollectTraficCongestionParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        param.setUserNo(userNo);
+        return collectTrafficCongestionDao.pageTraffic(param);
+    }
+}

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckLeaveServiceImpl.java

+package com.clx.performance.service.impl.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.collect.CollectTruckLeaveDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.collect.CollectTruckLeave;
+import com.clx.performance.param.app.collect.CollectTruckLeaveSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.service.collect.CollectTruckLeaveService;
+import com.clx.performance.struct.collect.CollectTruckLeaveStruct;
+import com.clx.performance.utils.LocalDateTimeUtils;
+import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Slf4j
+@Service
+public class CollectTruckLeaveServiceImpl implements CollectTruckLeaveService {
+
+    @Autowired
+    private CollectTruckLeaveDao collectTruckLeaveDao;
+
+    @Autowired
+    private CollectTruckLeaveStruct collectTruckLeaveStruct;
+
+
+    @Override
+    public void saveLeave(CollectTruckLeaveSaveParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        CollectTruckLeave collectTruckLeave = new CollectTruckLeave();
+        collectTruckLeave.setUserNo(userNo);
+        collectTruckLeave.setName(loginUserInfo.getUserName());
+        collectTruckLeave.setMobile(loginUserInfo.getUserMobile());
+        collectTruckLeave.setTruckNo("");
+
+        collectTruckLeave.setBeginTime(LocalDateTimeUtils.parseTime(param.getBeginTime()));
+        collectTruckLeave.setEndTime(LocalDateTimeUtils.parseTime(param.getEndTime()));
+        collectTruckLeave.setRemark(param.getRemark());
+        collectTruckLeaveDao.saveEntity(collectTruckLeave);
+    }
+
+    @Override
+    public CollectTruckLeaveVO getInfo(Integer id) {
+        return collectTruckLeaveDao.getEntityByKey(id).map(collectTruckLeaveStruct::convert).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+    }
+
+    @Override
+    public IPage<CollectTruckLeaveVO> pageLeave(PageCollectTruckLeaveParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        param.setUserNo(userNo);
+        return collectTruckLeaveDao.pageLeave(param);
+    }
+}

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckLocationServiceImpl.java

+package com.clx.performance.service.impl.collect;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.collect.CollectTruckLocationDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.collect.CollectTruckLocation;
+import com.clx.performance.model.collect.CollectTruckRefuel;
+import com.clx.performance.param.app.collect.CollectTruckLocationSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.service.collect.CollectTruckLocationService;
+import com.clx.performance.struct.collect.CollectTruckLocationStruct;
+import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@Service
+public class CollectTruckLocationServiceImpl implements CollectTruckLocationService {
+
+    @Autowired
+    private CollectTruckLocationDao collectTruckLocationDao;
+
+    @Autowired
+    private CollectTruckLocationStruct collectTruckLocationStruct;
+
+
+    @Override
+    public void saveLocationReport(CollectTruckLocationSaveParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        CollectTruckLocation collectTruckLocation = new CollectTruckLocation();
+        collectTruckLocation.setUserNo(userNo);
+        collectTruckLocation.setName(loginUserInfo.getUserName());
+        collectTruckLocation.setMobile(loginUserInfo.getUserMobile());
+
+        collectTruckLocation.setTruckNo(param.getTruckNo());
+        collectTruckLocation.setTruckOrderStatus(param.getTruckOrderStatus());
+        collectTruckLocation.setLongitude(param.getLongitude());
+        collectTruckLocation.setLatitude(param.getLatitude());
+        collectTruckLocation.setAddress(param.getAddress());
+        collectTruckLocation.setReportTime(LocalDateTime.now());
+
+        collectTruckLocationDao.saveEntity(collectTruckLocation);
+    }
+
+    @Override
+    public CollectTruckLocationVO getReportInfo(Integer id) {
+        return collectTruckLocationDao.getEntityByKey(id).map(collectTruckLocationStruct::convert).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+
+    }
+
+    @Override
+    public IPage<CollectTruckLocationVO> pageLocationReport(PageCollectTruckLocationParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        param.setUserNo(userNo);
+        return collectTruckLocationDao.pageLocation(param);
+    }
+}

performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectTruckRefuelServiceImpl.java

+package com.clx.performance.service.impl.collect;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.clx.performance.dao.OrderChildDao;
+import com.clx.performance.dao.collect.CollectTruckRefuelDao;
+import com.clx.performance.enums.PerformanceResultEnum;
+import com.clx.performance.model.OrderChild;
+import com.clx.performance.model.collect.CollectTruckRefuel;
+import com.clx.performance.param.app.collect.CollectTruckRefuelSaveParam;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.service.collect.CollectTruckRefuelService;
+import com.clx.performance.struct.collect.CollectTruckRefuelStruct;
+import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+
+@Slf4j
+@Service
+public class CollectTruckRefuelServiceImpl implements CollectTruckRefuelService {
+
+    @Autowired
+    private CollectTruckRefuelDao collectTruckRefuelDao;
+
+    @Autowired
+    private OrderChildDao orderChildDao;
+
+    @Autowired
+    private CollectTruckRefuelStruct collectTruckRefuelStruct;
+
+
+    @Override
+    public void saveRefuelReport(CollectTruckRefuelSaveParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        OrderChild orderChild = orderChildDao.getByChildNo(param.getChildNo()).orElseThrow(PerformanceResultEnum.ORDER_CHILD_NO_FOUND);
+
+        CollectTruckRefuel collectTruckRefuel = new CollectTruckRefuel();
+        collectTruckRefuel.setUserNo(userNo);
+        collectTruckRefuel.setName(loginUserInfo.getUserName());
+        collectTruckRefuel.setMobile(loginUserInfo.getUserMobile());
+
+        collectTruckRefuel.setTruckNo(orderChild.getTruckNo());
+        collectTruckRefuel.setChildNo(orderChild.getChildNo());
+        collectTruckRefuel.setSendAddress(orderChild.getSendAddress());
+        collectTruckRefuel.setReceiveAddress(orderChild.getReceiveAddress());
+
+        collectTruckRefuel.setLoadImage(JSON.toJSONString(param.getLoadImageList()));
+        collectTruckRefuel.setUnloadImage(JSON.toJSONString(param.getUnloadImageList()));
+        collectTruckRefuel.setLoadOil(param.getLoadOil());
+        collectTruckRefuel.setUnloadOil(param.getUnloadOil());
+        collectTruckRefuel.setReportTime(LocalDateTime.now());
+
+        collectTruckRefuelDao.saveEntity(collectTruckRefuel);
+    }
+
+    @Override
+    public CollectTruckRefuelVO getReportInfo(Integer id) {
+
+        return collectTruckRefuelDao.getEntityByKey(id).map(collectTruckRefuelStruct::convert).orElseThrow(PerformanceResultEnum.DATA_NOT_FIND);
+    }
+
+    @Override
+    public IPage<CollectTruckRefuelVO> pageRefuelReport(PageCollectTruckRefuelParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        param.setUserNo(userNo);
+        return collectTruckRefuelDao.pageRefuel(param);
+    }
+}

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTrafficCongestionProvider.java

+package com.clx.performance.sqlProvider.collect;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+public class CollectTrafficCongestionProvider {
+
+    public String pageTraffic(@Param("page") Page<CollectTrafficCongestionVO> page, @Param("param") PageCollectTraficCongestionParam param) {
+        return new SQL(){{
+            SELECT(" id, user_no as userNo, name, mobile, " +
+                    " truck_no as truckNo, " +
+                    " province, city, county, town, street, address, " +
+                    " longitude, latitude, " +
+                    " jam_time as jamTime, jam_image as jamImage, " +
+                    " date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
+                    " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
+                    "date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
+            );
+            FROM("collect_traffic_congestion ");
+            WHERE("user_no = #{param.userNo} ");
+
+            ORDER_BY("create_time desc");
+        }}.toString();
+    }
+
+
+
+}

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckLeaveProvider.java

+package com.clx.performance.sqlProvider.collect;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.collect.PageCollectTruckLeaveParam;
+import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+public class CollectTruckLeaveProvider {
+
+    public String pageLeave(@Param("page") Page<CollectTruckLeaveVO> page, @Param("param") PageCollectTruckLeaveParam param) {
+        return new SQL(){{
+            SELECT(" id, user_no as userNo, name, mobile, truck_no as truckNo, " +
+                    " date_format(begin_time, '%Y-%m-%d %H:%i:%s') as beginTime, " +
+                    " date_format(end_time, '%Y-%m-%d %H:%i:%s') as endTime, " +
+                    " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
+                    " date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
+            );
+            FROM("collect_truck_leave ");
+            WHERE("user_no = #{param.userNo} ");
+
+            ORDER_BY("create_time desc");
+        }}.toString();
+    }
+
+
+
+}

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckLocationProvider.java

+package com.clx.performance.sqlProvider.collect;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.collect.PageCollectTruckLocationParam;
+import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+public class CollectTruckLocationProvider {
+
+    public String pageLocation(@Param("page") Page<CollectTruckLocationVO> page, @Param("param") PageCollectTruckLocationParam param) {
+        return new SQL(){{
+            SELECT(" id, user_no as userNo, name, mobile, " +
+                    " truck_no as truckNo, " +
+                    " province, city, county, town, street, address, longitude, latitude, " +
+                    " truck_order_status as truckOrderStatus, " +
+                    " date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
+                    " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
+                    "date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
+            );
+            FROM("collect_truck_location ");
+            WHERE("user_no = #{param.userNo} ");
+
+            ORDER_BY("create_time desc");
+        }}.toString();
+    }
+
+
+
+}

performance-web/src/main/java/com/clx/performance/sqlProvider/collect/CollectTruckRefuelProvider.java

+package com.clx.performance.sqlProvider.collect;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.collect.PageCollectTraficCongestionParam;
+import com.clx.performance.param.app.collect.PageCollectTruckRefuelParam;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+public class CollectTruckRefuelProvider {
+
+    public String pageRefuel(@Param("page") Page<CollectTruckRefuelVO> page, @Param("param") PageCollectTruckRefuelParam param) {
+        return new SQL(){{
+            SELECT(" id, user_no as userNo, name, mobile, " +
+                    " truck_no as truckNo, child_no as childNo, " +
+                    " send_address as sendAddress, receive_address as receiveAddress, " +
+                    " load_image as loadImage, load_oil as loadOil, " +
+                    " unload_image as unloadImage, unload_oil as unloadOil, " +
+                    " date_format(report_time, '%Y-%m-%d %H:%i:%s') as reportTime, " +
+                    " date_format(create_time, '%Y-%m-%d %H:%i:%s') as createTime, " +
+                    " date_format(modified_time, '%Y-%m-%d %H:%i:%s') as modifiedTime "
+            );
+            FROM("collect_truck_refuel ");
+            WHERE("user_no = #{param.userNo} ");
+
+            ORDER_BY("create_time desc");
+        }}.toString();
+    }
+
+
+
+}

performance-web/src/main/java/com/clx/performance/struct/collect/CollectLineReportStruct.java

+package com.clx.performance.struct.collect;
+
+import com.clx.performance.model.collect.CollectLineReport;
+import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import com.msl.common.utils.DateStructUtil;
+import org.mapstruct.Mapper;
+
+import java.util.Objects;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {Objects.class})
+public interface CollectLineReportStruct {
+
+    CollectLineReportVO convert(CollectLineReport item);
+
+}

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTrafficCongestionStruct.java

+package com.clx.performance.struct.collect;
+
+import com.clx.performance.model.collect.CollectTrafficCongestion;
+import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
+import com.msl.common.utils.DateStructUtil;
+import org.mapstruct.Mapper;
+
+import java.util.Objects;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {Objects.class})
+public interface CollectTrafficCongestionStruct {
+
+    CollectTrafficCongestionVO convert(CollectTrafficCongestion item);
+
+}

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTruckLeaveStruct.java

+package com.clx.performance.struct.collect;
+
+import com.clx.performance.model.collect.CollectTruckLeave;
+import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
+import com.msl.common.utils.DateStructUtil;
+import org.mapstruct.Mapper;
+
+import java.util.Objects;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {Objects.class})
+public interface CollectTruckLeaveStruct {
+
+    CollectTruckLeaveVO convert(CollectTruckLeave item);
+
+}

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTruckLocationStruct.java

+package com.clx.performance.struct.collect;
+
+import com.clx.performance.model.collect.CollectTruckLocation;
+import com.clx.performance.model.collect.CollectTruckRefuel;
+import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
+import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.msl.common.utils.DateStructUtil;
+import org.mapstruct.Mapper;
+
+import java.util.Objects;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {Objects.class})
+public interface CollectTruckLocationStruct {
+
+    CollectTruckLocationVO convert(CollectTruckLocation item);
+
+
+}

performance-web/src/main/java/com/clx/performance/struct/collect/CollectTruckRefuelStruct.java

+package com.clx.performance.struct.collect;
+
+import com.clx.performance.model.collect.CollectTruckRefuel;
+import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
+import com.msl.common.utils.DateStructUtil;
+import org.mapstruct.Mapper;
+
+import java.util.Objects;
+
+@Mapper(componentModel = "spring", uses = DateStructUtil.class, imports = {Objects.class})
+public interface CollectTruckRefuelStruct {
+
+    CollectTruckRefuelVO convert(CollectTruckRefuel item);
+
+
+}