Skip to content

C
clx-performance
提交 80265945 authored 作者: aiqingguo's avatar aiqingguo
浏览文件
操作

司机上报

上级 c8339b5e
隐藏空白字符变更
内嵌 并排
正在显示 包含 79 行增加 和 50 行删除
performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportAbnormalSaveParam.java 0 → 100644
浏览文件 @ 80265945
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;
@Getter
@Setter
@NoArgsConstructor
public class CollectLineReportAbnormalSaveParam {
@ApiModelProperty(value = "上报类型：1:无法到达货源地 2:无法装货 3：无法到达目的地 4装车卸车异常", example = "")
@NotNull(message = "上报类型不能为空")
private Integer reportType;
@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/CollectLineReportLoadAbnormalSaveParam.java
浏览文件 @ 80265945
package com.clx.performance.param.app.collect;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
......@@ -10,6 +11,7 @@ import javax.validation.constraints.NotBlank;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class CollectLineReportLoadAbnormalSaveParam {
@ApiModelProperty(value = "运单编号")
......
performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportLoadUnloadAbnormalSaveParam.java
浏览文件 @ 80265945
package com.clx.performance.param.app.collect;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
......@@ -10,14 +11,15 @@ import javax.validation.constraints.NotBlank;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class CollectLineReportLoadUnloadAbnormalSaveParam {
@ApiModelProperty(value = "运单编号")
@NotBlank(message = "运单编号不能为空")
private String childNo;
@ApiModelProperty(value = "异常类型：1装车时间异常 2卸车时间异常", example = "1")
@NotBlank(message = "异常类型不能为空")
private Integer type;
@ApiModelProperty(value = "装卸车异常原因", example = "车辆问题")
@NotBlank(message = "无法到达装货地原因不能为空")
private String remark;
}
performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportReceiveAddressAbnormalSaveParam.java
浏览文件 @ 80265945
package com.clx.performance.param.app.collect;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
......@@ -10,6 +11,7 @@ import javax.validation.constraints.NotBlank;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class CollectLineReportReceiveAddressAbnormalSaveParam {
@ApiModelProperty(value = "运单编号")
......
performance-api/src/main/java/com/clx/performance/param/app/collect/CollectLineReportSendAddressAbnormalSaveParam.java
浏览文件 @ 80265945
package com.clx.performance.param.app.collect;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.Setter;
......@@ -10,6 +11,7 @@ import javax.validation.constraints.NotBlank;
@Getter
@Setter
@NoArgsConstructor
@AllArgsConstructor
public class CollectLineReportSendAddressAbnormalSaveParam {
@ApiModelProperty(value = "运单编号")
......
performance-api/src/main/java/com/clx/performance/vo/app/collect/CollectLineReportVO.java
浏览文件 @ 80265945
......@@ -50,7 +50,7 @@ public class CollectLineReportVO {
@ApiModelProperty(value = "类型：1 发货地 2 目的地", example = "")
private Integer type;
@ApiModelProperty(value = "上报类型：1:无法到达货源地 2:无法装货 3：无法到达目的地 4：运单取消 5：装车卸车异常 6：没有接单 7：货源地情况 8:其它上报 9：煤炭质量上报", example = "")
@ApiModelProperty(value = "上报类型（1~4异常上报）：1:无法到达货源地 2:无法装货 3：无法到达目的地 4：装车卸车异常 6：没有接单 7：货源地情况 8:其它上报 9：煤炭质量上报", example = "")
private Integer reportType;
@ApiModelProperty(value = "拉运状态 1: 正常 2：异常", example = "")
private Integer reportStatus;
......
performance-web/src/main/java/com/clx/performance/controller/app/AppDriverCollectLineReportController.java
浏览文件 @ 80265945
......@@ -32,6 +32,15 @@ public class AppDriverCollectLineReportController {
return Result.ok();
}
@ApiOperation(value = "上报异常", notes = "<br>By:艾庆国")
@PostMapping("/saveAbnormalReport")
public Result<Void> saveAbnormalReport(@RequestBody @Validated CollectLineReportAbnormalSaveParam param) {
collectLineReportService.saveAbnormalReport(param);
return Result.ok();
}
@Deprecated
@ApiOperation(value = "上报异常无法到达货源地", notes = "<br>By:艾庆国")
@PostMapping("/saveSendAddressAbnormalReport")
public Result<Void> saveSendAddressAbnormalReport(@RequestBody @Validated CollectLineReportSendAddressAbnormalSaveParam param) {
......@@ -39,6 +48,7 @@ public class AppDriverCollectLineReportController {
return Result.ok();
}
@Deprecated
@ApiOperation(value = "上报异常无法装货", notes = "<br>By:艾庆国")
@PostMapping("/saveLoadAbnormalReport")
public Result<Void> saveLoadAbnormalReport(@RequestBody @Validated CollectLineReportLoadAbnormalSaveParam param) {
......@@ -46,6 +56,7 @@ public class AppDriverCollectLineReportController {
return Result.ok();
}
@Deprecated
@ApiOperation(value = "上报异常无法到达目的地", notes = "<br>By:艾庆国")
@PostMapping("/saveReceiveAddressAbnormalReport")
public Result<Void> saveReceiveAddressAbnormalReport(@RequestBody @Validated CollectLineReportReceiveAddressAbnormalSaveParam param) {
......@@ -53,7 +64,7 @@ public class AppDriverCollectLineReportController {
return Result.ok();
}
@Deprecated
@ApiOperation(value = "上报装卸车异常", notes = "<br>By:艾庆国")
@PostMapping("/saveLoadUnloadAbnormalReport")
public Result<Void> saveLoadUnloadAbnormalReport(@RequestBody @Validated CollectLineReportLoadUnloadAbnormalSaveParam param) {
......@@ -62,6 +73,7 @@ public class AppDriverCollectLineReportController {
return Result.ok();
}
@ApiOperation(value = "上报异常没有接单原因", notes = "<br>By:艾庆国")
@PostMapping("/saveNoTakeOrderAbnormalReport")
public Result<Void> saveNoTakeOrderAbnormalReport(@RequestBody @Validated CollectLineReportNoTakeOrderAbnormalSaveParam param) {
......
performance-web/src/main/java/com/clx/performance/model/collect/CollectLineReport.java
浏览文件 @ 80265945
......@@ -74,8 +74,7 @@ public class CollectLineReport implements HasKey<Integer> {
UNABLE_TO_SEND_ADDRESS(1, "无法到达货源地"),
UNABLE_LOAD(2, "无法装货"),
UNABLE_TO_RECEIVE_ADDRESS(3, "无法到达目的地"),
CANCEL(4, "运单取消"),
LOAD_UNLOAD(5, "装车卸车异常"),
LOAD_UNLOAD(4, "装车卸车异常"),
NO_TAKE_ORDER(6, "没有接单"),
SEND_ADDRESS(7, "货源地情况"),
......
performance-web/src/main/java/com/clx/performance/service/collect/CollectLineReportService.java
浏览文件 @ 80265945
......@@ -5,12 +5,11 @@ import com.clx.performance.param.app.collect.*;
import com.clx.performance.param.pc.carrier.*;
import com.clx.performance.vo.app.collect.CollectLineReportVO;
import java.util.List;
public interface CollectLineReportService {
void saveSendAddressReport(CollectLineReportSendAddressSaveParam param);
void saveAbnormalReport(CollectLineReportAbnormalSaveParam param);
void saveSendAddressAbnormalReport(CollectLineReportSendAddressAbnormalSaveParam param);
void saveLoadAbnormalReport(CollectLineReportLoadAbnormalSaveParam param);
void saveReceiveAddressAbnormalReport(CollectLineReportReceiveAddressAbnormalSaveParam param);
......@@ -18,8 +17,6 @@ public interface CollectLineReportService {
void saveLoadUnloadAbnormalReport(CollectLineReportLoadUnloadAbnormalSaveParam param);
void saveCancelAbnormalReport(String childNo, String remark, List<String> imageList);
void saveOtherReport(CollectLineReportOtherSaveParam param);
void saveQualityReport(CollectLineReportQualitySaveParam param);
......
performance-web/src/main/java/com/clx/performance/service/impl/OrderChildServiceImpl.java
浏览文件 @ 80265945
......@@ -1053,9 +1053,6 @@ public class OrderChildServiceImpl implements OrderChildService {
// 更新出车状态
updateDriverOrderStatusCancel(orderChild.getDriverUserNo(), orderChild.getTruckId());
// 取消上报
collectLineReportService.saveCancelAbnormalReport(childNo, orderChild.getCancelRemark(), param.getImageList());
// 日志
orderChildLogService.saveDriverOrderChildLog(childNo, OrderChildLogEnum.Type.DRIVER_CANCEL.getCode(),
OrderChildLogEnum.Type.DRIVER_CANCEL.getMsg(), loginUserInfo.getUserNo(), loginUserInfo.getUserName());
......
performance-web/src/main/java/com/clx/performance/service/impl/collect/CollectLineReportServiceImpl.java
浏览文件 @ 80265945
......@@ -64,6 +64,22 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
collectLineReportDao.saveEntity(collectLineReport);
}
@Override
public void saveAbnormalReport(CollectLineReportAbnormalSaveParam param) {
if (Objects.equals(param.getReportType(), CollectLineReport.ReportType.UNABLE_TO_SEND_ADDRESS.getCode())){
saveSendAddressAbnormalReport(new CollectLineReportSendAddressAbnormalSaveParam(param.getChildNo(), param.getRemark()));
}
else if (Objects.equals(param.getReportType(), CollectLineReport.ReportType.UNABLE_LOAD.getCode())){
saveLoadAbnormalReport(new CollectLineReportLoadAbnormalSaveParam(param.getChildNo(), param.getRemark()));
}
else if (Objects.equals(param.getReportType(), CollectLineReport.ReportType.UNABLE_TO_RECEIVE_ADDRESS.getCode())){
saveReceiveAddressAbnormalReport(new CollectLineReportReceiveAddressAbnormalSaveParam(param.getChildNo(), param.getRemark()));
}
else if (Objects.equals(param.getReportType(), CollectLineReport.ReportType.LOAD_UNLOAD.getCode())){
saveLoadUnloadAbnormalReport(new CollectLineReportLoadUnloadAbnormalSaveParam(param.getChildNo(), param.getRemark()));
}
}
@Override
public void saveSendAddressAbnormalReport(CollectLineReportSendAddressAbnormalSaveParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
......@@ -152,7 +168,7 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
}
@Override
public void saveNoTakeOrderAbnormalReport(CollectLineReportNoTakeOrderAbnormalSaveParam param) {
public void saveLoadUnloadAbnormalReport(CollectLineReportLoadUnloadAbnormalSaveParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
Long userNo = loginUserInfo.getUserNo();
......@@ -170,8 +186,7 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
collectLineReport.setReceiveAddressId(orderChild.getReceiveAddressId());
collectLineReport.setReceiveAddress(orderChild.getReceiveAddress());
collectLineReport.setType(CollectLineReport.Type.SEND.getCode());
collectLineReport.setReportType(CollectLineReport.ReportType.NO_TAKE_ORDER.getCode());
collectLineReport.setReportType(CollectLineReport.ReportType.LOAD_UNLOAD.getCode());
collectLineReport.setReportStatus(CollectLineReport.ReportStatus.ABNORMAL.getCode());
collectLineReport.setRemark(param.getRemark());
......@@ -180,8 +195,9 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
collectLineReportDao.saveEntity(collectLineReport);
}
@Override
public void saveLoadUnloadAbnormalReport(CollectLineReportLoadUnloadAbnormalSaveParam param) {
public void saveNoTakeOrderAbnormalReport(CollectLineReportNoTakeOrderAbnormalSaveParam param) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
Long userNo = loginUserInfo.getUserNo();
......@@ -199,40 +215,11 @@ public class CollectLineReportServiceImpl implements CollectLineReportService {
collectLineReport.setReceiveAddressId(orderChild.getReceiveAddressId());
collectLineReport.setReceiveAddress(orderChild.getReceiveAddress());
collectLineReport.setType(Objects.equals(param.getType(),1)? CollectLineReport.Type.SEND.getCode() : CollectLineReport.Type.RECEIVE.getCode());
collectLineReport.setReportType(CollectLineReport.ReportType.LOAD_UNLOAD.getCode());
collectLineReport.setReportStatus(CollectLineReport.ReportStatus.ABNORMAL.getCode());
collectLineReport.setRemark(Objects.equals(param.getType(),1)? "装车时间异常" : "卸车时间异常");
collectLineReport.setReportTime(LocalDateTime.now());
collectLineReport.setCreateTime(collectLineReport.getReportTime());
collectLineReportDao.saveEntity(collectLineReport);
}
@Override
public void saveCancelAbnormalReport(String childNo, String remark, List<String> imageList) {
UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
Long userNo = loginUserInfo.getUserNo();
OrderChild orderChild = orderChildDao.getByChildNo(childNo).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(childNo);
collectLineReport.setSendAddressId(orderChild.getSendAddressId());
collectLineReport.setSendAddress(orderChild.getSendAddress());
collectLineReport.setReceiveAddressId(orderChild.getReceiveAddressId());
collectLineReport.setReceiveAddress(orderChild.getReceiveAddress());
collectLineReport.setReportType(CollectLineReport.ReportType.CANCEL.getCode());
collectLineReport.setType(CollectLineReport.Type.SEND.getCode());
collectLineReport.setReportType(CollectLineReport.ReportType.NO_TAKE_ORDER.getCode());
collectLineReport.setReportStatus(CollectLineReport.ReportStatus.ABNORMAL.getCode());
collectLineReport.setRemark(remark);
collectLineReport.setImage(imageList==null? null:JSON.toJSONString(imageList));
collectLineReport.setRemark(param.getRemark());
collectLineReport.setReportTime(LocalDateTime.now());
collectLineReport.setCreateTime(collectLineReport.getReportTime());
collectLineReportDao.saveEntity(collectLineReport);
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论