司机上报

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportLoadAbnormalSaveParam.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;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportLoadAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达交货地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达交货地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportLoadUnloadAbnormalSaveParam.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;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportLoadUnloadAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "异常类型：1装车时间异常 2卸车时间异常", example = "1")
+    @NotBlank(message = "异常类型不能为空")
+    private Integer type;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportOrderChildCancelAbnormalSaveParam.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;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportOrderChildCancelAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "没有接单原因", example = "车辆问题")
+    @NotBlank(message = "没有接单原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportOtherSaveParam.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;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportOtherSaveParam {
+
+    @ApiModelProperty(value = "上报信息")
+    @NotBlank(message = "上报信息不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportQualitySaveParam.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;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportQualitySaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达交货地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达交货地原因不能为空")
+    private String remark;
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportReceiveAddressAbnormalSaveParam.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;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportReceiveAddressAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达装货地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达装货地原因不能为空")
+    private String remark;
+
+
+}

performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportSendAddressAbnormalSaveParam.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;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class CollectLineReportSendAddressAbnormalSaveParam {
+
+    @ApiModelProperty(value = "运单编号")
+    @NotBlank(message = "运单编号不能为空")
+    private String childNo;
+
+    @ApiModelProperty(value = "无法到达货源地原因", example = "车辆问题")
+    @NotBlank(message = "无法到达货源地原因不能为空")
+    private String remark;
+
+
+}

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.param.app.collect.*;
 import com.clx.performance.service.collect.CollectLineReportService;
 import com.clx.performance.vo.app.collect.CollectLineReportVO;
 import com.msl.common.base.PageData;
@@ -33,6 +32,58 @@ public class AppDriverCollectLineReportController {
         return Result.ok();
     }
 
+    @ApiOperation(value = "上报异常无法到达货源地", notes = "<br>By:艾庆国")
+    @PostMapping("/saveSendAddressAbnormalReport")
+    public Result<Void> saveSendAddressAbnormalReport(@RequestBody @Validated CollectLineReportSendAddressAbnormalSaveParam param) {
+        collectLineReportService.saveSendAddressAbnormalReport(param);
+
+        return Result.ok();
+    }
+    @ApiOperation(value = "上报异常无法装货", notes = "<br>By:艾庆国")
+    @PostMapping("/saveLoadAbnormalReport")
+    public Result<Void> saveLoadAbnormalReport(@RequestBody @Validated CollectLineReportLoadAbnormalSaveParam param) {
+        collectLineReportService.saveLoadAbnormalReport(param);
+
+        return Result.ok();
+    }
+    @ApiOperation(value = "上报异常无法到达装货地", notes = "<br>By:艾庆国")
+    @PostMapping("/saveReceiveAddressAbnormalReport")
+    public Result<Void> saveReceiveAddressAbnormalReport(@RequestBody @Validated CollectLineReportReceiveAddressAbnormalSaveParam param) {
+        collectLineReportService.saveReceiveAddressAbnormalReport(param);
+
+        return Result.ok();
+    }
+    @ApiOperation(value = "上报异常没有接单原因", notes = "<br>By:艾庆国")
+    @PostMapping("/saveOrderChildCancelAbnormalReport")
+    public Result<Void> saveOrderChildCancelAbnormalReport(@RequestBody @Validated CollectLineReportOrderChildCancelAbnormalSaveParam param) {
+        collectLineReportService.saveOrderChildCancelAbnormalReport(param);
+
+        return Result.ok();
+    }
+    @ApiOperation(value = "上报装卸车异常", notes = "<br>By:艾庆国")
+    @PostMapping("/saveLoadUnloadAbnormalReport")
+    public Result<Void> saveLoadUnloadAbnormalReport(@RequestBody @Validated CollectLineReportLoadUnloadAbnormalSaveParam param) {
+        collectLineReportService.saveLoadUnloadAbnormalReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "上报其它情况", notes = "<br>By:艾庆国")
+    @PostMapping("/saveOtherReport")
+    public Result<Void> saveOtherReport(@RequestBody @Validated CollectLineReportOtherSaveParam param) {
+        collectLineReportService.saveOtherReport(param);
+
+        return Result.ok();
+    }
+
+    @ApiOperation(value = "上报煤炭质量", notes = "<br>By:艾庆国")
+    @PostMapping("/saveQualityReport")
+    public Result<Void> saveQualityReport(@RequestBody @Validated CollectLineReportQualitySaveParam param) {
+        collectLineReportService.saveQualityReport(param);
+
+        return Result.ok();
+    }
+
     @ApiOperation(value = "查询线路上报详情", notes = "<br>By:艾庆国")
     @GetMapping("/getReportInfo")
     public Result<CollectLineReportVO> getReportInfo(Integer id) {

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

 package com.clx.performance.dao.collect;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.mapper.collect.CollectLineReportMapper;
 import com.clx.performance.model.collect.CollectLineReport;
+import com.clx.performance.param.app.collect.PageCollectLineReportParam;
+import com.clx.performance.vo.app.collect.CollectLineReportVO;
 import com.msl.common.dao.BaseDao;
 
 /**
  * @Author: aiqinguo
- * @Description: 运单图片
+ * @Description: 线路信息上报
  * @Date: 2023/09/18 11:34:50
  * @Version: 1.0
  */
 public interface CollectLineReportDao extends BaseDao<CollectLineReportMapper, CollectLineReport, Integer> {
 
+    IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam param);
 
 }

performance-web/src/main/java/com/clx/performance/dao/impl/collect/CollectLineReportDaoImpl.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.CollectLineReportDao;
 import com.clx.performance.mapper.collect.CollectLineReportMapper;
 import com.clx.performance.model.collect.CollectLineReport;
+import com.clx.performance.param.app.collect.PageCollectLineReportParam;
+import com.clx.performance.vo.app.collect.CollectLineReportVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
 import org.springframework.stereotype.Repository;
 
@@ -15,4 +19,9 @@ import org.springframework.stereotype.Repository;
 @Repository
 public class CollectLineReportDaoImpl extends BaseDaoImpl<CollectLineReportMapper, CollectLineReport, Integer> implements CollectLineReportDao {
 
+    @Override
+    public IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam param) {
+        Page<CollectLineReportVO> page = Page.of(param.getPage(), param.getPageSize());
+        return baseMapper.pageLineReport(page,param);
+    }
 }

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

@@ -4,17 +4,16 @@ 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.param.app.collect.PageCollectLineReportParam;
+import com.clx.performance.sqlProvider.collect.CollectLineReportSqlProvider;
 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
-* @Description: 运单图片
+* @Description: 线路信息上报
 * @Date: 2023/09/18 11:34:50
 * @Version: 1.0
 */
@@ -22,9 +21,9 @@ import org.apache.ibatis.annotations.SelectProvider;
 @Mapper
 public interface CollectLineReportMapper extends BaseMapper<CollectLineReport> {
     /**
-     * @see CollectTrafficCongestionProvider#pageTraffic(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTraficCongestionParam)
+     * @see CollectLineReportSqlProvider#pageLineReport(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectLineReportParam)
      */
-    @SelectProvider(type = CollectTrafficCongestionProvider.class, method = "pageTraffic")
-    IPage<CollectLineReportVO> pageTraffic(@Param("page") Page<CollectLineReportVO> page, @Param("param") PageCollectTraficCongestionParam param);
+    @SelectProvider(type = CollectLineReportSqlProvider.class, method = "pageLineReport")
+    IPage<CollectLineReportVO> pageLineReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") PageCollectLineReportParam param);
 
 }
\ No newline at end of file

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

@@ -5,7 +5,7 @@ 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.sqlProvider.collect.CollectTrafficCongestionSqlProvider;
 import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,9 +21,9 @@ import org.apache.ibatis.annotations.SelectProvider;
 @Mapper
 public interface CollectTrafficCongestionMapper extends BaseMapper<CollectTrafficCongestion> {
     /**
-     * @see CollectTrafficCongestionProvider#pageTraffic(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTraficCongestionParam)
+     * @see CollectTrafficCongestionSqlProvider#pageTraffic(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTraficCongestionParam)
      */
-    @SelectProvider(type = CollectTrafficCongestionProvider.class, method = "pageTraffic")
+    @SelectProvider(type = CollectTrafficCongestionSqlProvider.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

@@ -5,7 +5,7 @@ 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.sqlProvider.collect.CollectTruckLeaveSqlProvider;
 import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,9 +21,9 @@ import org.apache.ibatis.annotations.SelectProvider;
 @Mapper
 public interface CollectTruckLeaveMapper extends BaseMapper<CollectTruckLeave> {
     /**
-     * @see CollectTruckLeaveProvider#pageLeave(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTruckLeaveParam)
+     * @see CollectTruckLeaveSqlProvider#pageLeave(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTruckLeaveParam)
      */
-    @SelectProvider(type = CollectTruckLeaveProvider.class, method = "pageLeave")
+    @SelectProvider(type = CollectTruckLeaveSqlProvider.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

@@ -5,7 +5,7 @@ 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.sqlProvider.collect.CollectTruckLocationSqlProvider;
 import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,9 +21,9 @@ import org.apache.ibatis.annotations.SelectProvider;
 @Mapper
 public interface CollectTruckLocationMapper extends BaseMapper<CollectTruckLocation> {
     /**
-     * @see CollectTruckLocationProvider#pageLocation(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTruckLocationParam)
+     * @see CollectTruckLocationSqlProvider#pageLocation(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTruckLocationParam)
      */
-    @SelectProvider(type = CollectTruckLocationProvider.class, method = "pageLocation")
+    @SelectProvider(type = CollectTruckLocationSqlProvider.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

@@ -3,13 +3,9 @@ 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.sqlProvider.collect.CollectTruckRefuelSqlProvider;
 import com.clx.performance.vo.app.collect.CollectTruckRefuelVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -25,9 +21,9 @@ import org.apache.ibatis.annotations.SelectProvider;
 @Mapper
 public interface CollectTruckRefuelMapper extends BaseMapper<CollectTruckRefuel> {
     /**
-     * @see CollectTruckRefuelProvider#pageRefuel(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTruckRefuelParam)
+     * @see CollectTruckRefuelSqlProvider#pageRefuel(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTruckRefuelParam)
      */
-    @SelectProvider(type = CollectTruckRefuelProvider.class, method = "pageRefuel")
+    @SelectProvider(type = CollectTruckRefuelSqlProvider.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

@@ -5,7 +5,7 @@ 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.sqlProvider.collect.CollectTrafficCongestionSqlProvider;
 import com.clx.performance.vo.app.collect.CollectTruckWaitVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,9 +21,9 @@ import org.apache.ibatis.annotations.SelectProvider;
 @Mapper
 public interface CollectTruckWaitMapper extends BaseMapper<CollectTruckWait> {
     /**
-     * @see CollectTrafficCongestionProvider#pageTraffic(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTraficCongestionParam)
+     * @see CollectTrafficCongestionSqlProvider#pageTraffic(com.baomidou.mybatisplus.extension.plugins.pagination.Page, com.clx.performance.param.app.collect.PageCollectTraficCongestionParam)
      */
-    @SelectProvider(type = CollectTrafficCongestionProvider.class, method = "pageTraffic")
+    @SelectProvider(type = CollectTrafficCongestionSqlProvider.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

@@ -74,6 +74,7 @@ public class CollectLineReport implements HasKey<Integer> {
             return Arrays.stream(values()).filter(e -> e.code == code).findFirst();
         }
     }
+
     @Getter
     @AllArgsConstructor
     public enum ReportStatus {

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.param.app.collect.*;
 import com.clx.performance.vo.app.collect.CollectLineReportVO;
 
 public interface CollectLineReportService {
 
     void saveSendAddressReport(CollectLineReportSendAddressSaveParam param);
 
+    void saveSendAddressAbnormalReport(CollectLineReportSendAddressAbnormalSaveParam param);
+    void saveLoadAbnormalReport(CollectLineReportLoadAbnormalSaveParam param);
+    void saveReceiveAddressAbnormalReport(CollectLineReportReceiveAddressAbnormalSaveParam param);
+    void saveOrderChildCancelAbnormalReport(CollectLineReportOrderChildCancelAbnormalSaveParam param);
+    void saveLoadUnloadAbnormalReport(CollectLineReportLoadUnloadAbnormalSaveParam param);
+
+
+    void saveOtherReport(CollectLineReportOtherSaveParam param);
+    void saveQualityReport(CollectLineReportQualitySaveParam param);
+
     CollectLineReportVO getReportInfo(Integer id);
 
     IPage<CollectLineReportVO> pageLineReport(PageCollectLineReportParam 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.param.app.collect.*;
 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;
@@ -26,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Objects;
 
 @Slf4j
 @Service
@@ -51,7 +43,7 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         collectLineReport.setUserNo(userNo);
         collectLineReport.setName(loginUserInfo.getUserName());
         collectLineReport.setMobile(loginUserInfo.getUserMobile());
-        collectLineReport.setTruckNo("");
+        collectLineReport.setTruckNo(orderChild.getTruckNo());
 
         collectLineReport.setChildNo(param.getChildNo());
         collectLineReport.setAddressId(orderChild.getSendAddressId());
@@ -66,6 +58,174 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         collectLineReportDao.saveEntity(collectLineReport);
     }
 
+    @Override
+    public void saveSendAddressAbnormalReport(CollectLineReportSendAddressAbnormalSaveParam 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(orderChild.getTruckNo());
+
+        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(CollectLineReport.ReportStatus.ABNORMAL.getCode());
+        collectLineReport.setRemark(param.getRemark());
+        collectLineReport.setReportTime(LocalDateTime.now());
+        collectLineReportDao.saveEntity(collectLineReport);
+    }
+
+    @Override
+    public void saveLoadAbnormalReport(CollectLineReportLoadAbnormalSaveParam 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(orderChild.getTruckNo());
+
+        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(CollectLineReport.ReportStatus.ABNORMAL.getCode());
+        collectLineReport.setRemark(param.getRemark());
+        collectLineReport.setReportTime(LocalDateTime.now());
+        collectLineReportDao.saveEntity(collectLineReport);
+    }
+
+    @Override
+    public void saveReceiveAddressAbnormalReport(CollectLineReportReceiveAddressAbnormalSaveParam 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(orderChild.getTruckNo());
+
+        collectLineReport.setChildNo(param.getChildNo());
+        collectLineReport.setAddressId(orderChild.getSendAddressId());
+        collectLineReport.setAddress(orderChild.getSendAddress());
+
+        collectLineReport.setType(CollectLineReport.Type.RECEIVE.getCode());
+        collectLineReport.setReportType(CollectLineReport.ReportType.RECEIVE.getCode());
+
+        collectLineReport.setReportStatus(CollectLineReport.ReportStatus.ABNORMAL.getCode());
+        collectLineReport.setRemark(param.getRemark());
+        collectLineReport.setReportTime(LocalDateTime.now());
+        collectLineReportDao.saveEntity(collectLineReport);
+    }
+
+    @Override
+    public void saveOrderChildCancelAbnormalReport(CollectLineReportOrderChildCancelAbnormalSaveParam 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(orderChild.getTruckNo());
+
+        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(CollectLineReport.ReportStatus.ABNORMAL.getCode());
+        collectLineReport.setRemark(param.getRemark());
+        collectLineReport.setReportTime(LocalDateTime.now());
+        collectLineReportDao.saveEntity(collectLineReport);
+    }
+
+    @Override
+    public void saveLoadUnloadAbnormalReport(CollectLineReportLoadUnloadAbnormalSaveParam 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(orderChild.getTruckNo());
+
+        collectLineReport.setChildNo(param.getChildNo());
+        collectLineReport.setAddressId(orderChild.getSendAddressId());
+        collectLineReport.setAddress(orderChild.getSendAddress());
+
+        collectLineReport.setType(Objects.equals(param.getType(),1)? CollectLineReport.Type.SEND.getCode() : CollectLineReport.Type.RECEIVE.getCode());
+        collectLineReport.setReportType(Objects.equals(param.getType(),1)? CollectLineReport.ReportType.SEND.getCode() : CollectLineReport.ReportType.RECEIVE.getCode());
+
+        collectLineReport.setReportStatus(CollectLineReport.ReportStatus.ABNORMAL.getCode());
+        collectLineReport.setRemark(Objects.equals(param.getType(),1)? "装车时间异常" : "卸车时间异常");
+        collectLineReport.setReportTime(LocalDateTime.now());
+        collectLineReportDao.saveEntity(collectLineReport);
+    }
+
+    @Override
+    public void saveOtherReport(CollectLineReportOtherSaveParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        CollectLineReport collectLineReport = new CollectLineReport();
+        collectLineReport.setUserNo(userNo);
+        collectLineReport.setName(loginUserInfo.getUserName());
+        collectLineReport.setMobile(loginUserInfo.getUserMobile());
+
+        collectLineReport.setType(CollectLineReport.Type.SEND.getCode());
+        collectLineReport.setReportType(CollectLineReport.ReportType.SEND.getCode());
+
+        collectLineReport.setReportStatus(CollectLineReport.ReportStatus.NORMAL.getCode());
+        collectLineReport.setRemark(param.getRemark());
+        collectLineReport.setReportTime(LocalDateTime.now());
+        collectLineReportDao.saveEntity(collectLineReport);
+    }
+
+    @Override
+    public void saveQualityReport(CollectLineReportQualitySaveParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        Long userNo = loginUserInfo.getUserNo();
+
+        CollectLineReport collectLineReport = new CollectLineReport();
+        collectLineReport.setUserNo(userNo);
+        collectLineReport.setName(loginUserInfo.getUserName());
+        collectLineReport.setMobile(loginUserInfo.getUserMobile());
+
+        collectLineReport.setType(CollectLineReport.Type.RECEIVE.getCode());
+        collectLineReport.setReportType(CollectLineReport.ReportType.RECEIVE.getCode());
+
+        collectLineReport.setReportStatus(CollectLineReport.ReportStatus.NORMAL.getCode());
+        collectLineReport.setRemark(param.getRemark());
+        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);
@@ -78,6 +238,6 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
         Long userNo = loginUserInfo.getUserNo();
 
         param.setUserNo(userNo);
-        return null;
+        return collectLineReportDao.pageLineReport(param);
     }
 }

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

+package com.clx.performance.sqlProvider.collect;
+
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.clx.performance.param.app.collect.PageCollectLineReportParam;
+import com.clx.performance.vo.app.collect.CollectLineReportVO;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.jdbc.SQL;
+
+public class CollectLineReportSqlProvider {
+
+    public String pageLineReport(@Param("page") Page<CollectLineReportVO> page, @Param("param") PageCollectLineReportParam param) {
+        return new SQL(){{
+            SELECT(" id, user_no as userNo, name, mobile, " +
+                    " truck_no as truckNo, child_no as childNo, address_id as addressId, " +
+                    " address, " +
+                    " type, report_type as reportType, report_status as reportStatus, remark, image, " +
+                    " 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_line_report ");
+            WHERE("user_no = #{param.userNo} ");
+
+            ORDER_BY("create_time desc");
+        }}.toString();
+    }
+
+
+
+}

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

@@ -7,7 +7,7 @@ import com.clx.performance.vo.app.collect.CollectTrafficCongestionVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 
-public class CollectTrafficCongestionProvider {
+public class CollectTrafficCongestionSqlProvider {
 
     public String pageTraffic(@Param("page") Page<CollectTrafficCongestionVO> page, @Param("param") PageCollectTraficCongestionParam param) {
         return new SQL(){{

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

@@ -7,7 +7,7 @@ import com.clx.performance.vo.app.collect.CollectTruckLeaveVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 
-public class CollectTruckLeaveProvider {
+public class CollectTruckLeaveSqlProvider {
 
     public String pageLeave(@Param("page") Page<CollectTruckLeaveVO> page, @Param("param") PageCollectTruckLeaveParam param) {
         return new SQL(){{

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

@@ -7,7 +7,7 @@ import com.clx.performance.vo.app.collect.CollectTruckLocationVO;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.jdbc.SQL;
 
-public class CollectTruckLocationProvider {
+public class CollectTruckLocationSqlProvider {
 
     public String pageLocation(@Param("page") Page<CollectTruckLocationVO> page, @Param("param") PageCollectTruckLocationParam param) {
         return new SQL(){{

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

@@ -2,14 +2,12 @@ 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 class CollectTruckRefuelSqlProvider {
 
     public String pageRefuel(@Param("page") Page<CollectTruckRefuelVO> page, @Param("param") PageCollectTruckRefuelParam param) {
         return new SQL(){{