Compare commits
No commits in common. "d0cd1b7badea335224945c40b7c2749dcf423a7c35a1a02cd48dc387496284f1" and "a3fda60ae3c095f3aae1b7fe556148a4e065c53c5ec09a9db0b6691fd27b9a33" have entirely different histories.
d0cd1b7bad
...
a3fda60ae3
@ -26,9 +26,4 @@ public class FeignInspectionSwapOrderVo {
|
|||||||
|
|
||||||
@NotNull(message = "故障部位图片不能为空")
|
@NotNull(message = "故障部位图片不能为空")
|
||||||
private List<String> fileUrls;
|
private List<String> fileUrls;
|
||||||
|
|
||||||
/**
|
|
||||||
* 故障内容
|
|
||||||
*/
|
|
||||||
private String remarks;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -52,24 +52,6 @@ public class EbikeBikeOrderController {
|
|||||||
return JsonResult.success(orderPage);
|
return JsonResult.success(orderPage);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 工单详情。
|
|
||||||
*
|
|
||||||
* @param page 分页对象
|
|
||||||
* @return 分页对象
|
|
||||||
*/
|
|
||||||
@GetMapping("getInfo")
|
|
||||||
public JsonResult<?> getInfo(PageParam page, Integer orderType,String bikeCode) {
|
|
||||||
QueryWrapper queryWrapper = QueryWrapper.create()
|
|
||||||
.select(EBIKE_BIKE_INFO.LOCATION,EBIKE_BIKE_ORDER.ALL_COLUMNS)
|
|
||||||
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(BikeOrderHandleState.UNPROCESSED))
|
|
||||||
.where(EBIKE_BIKE_ORDER.ORDER_TYPE.eq(orderType, Objects.nonNull(orderType)))
|
|
||||||
.where(EBIKE_BIKE_ORDER.BIKE_CODE.like(bikeCode, StringUtil.hasText(bikeCode)))
|
|
||||||
.leftJoin(EBIKE_BIKE_INFO).on(EBIKE_BIKE_INFO.BIKE_CODE.eq(EBIKE_BIKE_ORDER.BIKE_CODE));
|
|
||||||
Page<EbikeBikeOrderPageDto> orderPage = ebikeBikeOrderService.pageAs(page.getPage(), queryWrapper, EbikeBikeOrderPageDto.class);
|
|
||||||
return JsonResult.success(orderPage);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 生成换电工单。
|
* 生成换电工单。
|
||||||
*
|
*
|
||||||
|
|||||||
@ -112,9 +112,4 @@ public class EbikeBikeOrder implements Serializable {
|
|||||||
*/
|
*/
|
||||||
private Long siteId;
|
private Long siteId;
|
||||||
|
|
||||||
/**
|
|
||||||
* 故障描述
|
|
||||||
*/
|
|
||||||
private String remarks;
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -26,6 +26,4 @@ public class InspectionSwapOrderVo {
|
|||||||
|
|
||||||
@NotNull(message = "故障部位图片不能为空")
|
@NotNull(message = "故障部位图片不能为空")
|
||||||
private List<String> fileUrls;
|
private List<String> fileUrls;
|
||||||
|
|
||||||
private String remarks;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -98,7 +98,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
|
|||||||
.orderCode(snowFlakeIDKeyGenerator.nextId())
|
.orderCode(snowFlakeIDKeyGenerator.nextId())
|
||||||
.orderType(BikeOrderType.INSPECTION)
|
.orderType(BikeOrderType.INSPECTION)
|
||||||
.operatorId(bikeInfo.getOperatorId())
|
.operatorId(bikeInfo.getOperatorId())
|
||||||
.remarks(inspectionSwapOrderVo.getRemarks())
|
|
||||||
.build();
|
.build();
|
||||||
this.mapper.insert(ebikeBikeOrder);
|
this.mapper.insert(ebikeBikeOrder);
|
||||||
Long orderId = ebikeBikeOrder.getOrderId();
|
Long orderId = ebikeBikeOrder.getOrderId();
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user