attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成巡检

Browse Source
This commit is contained in:
PC 2026-01-20 13:54:34 +08:00
parent ecb9d7f0d1
commit 21eaf7d2aa
3 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebike-operations/src/main/java/com/cdzy/operations/controller/EbikeBikeOrderController.java
View File

@ -350,7 +350,7 @@ public class EbikeBikeOrderController {
* *
* @return 操作结果 * @return 操作结果
*/ */
@GetMapping("batchFinishDispatch") @PostMapping("batchFinishDispatch")
public JsonResult<?> batchFinishDispatch(@RequestBody @Validated EbikeBatchDispatchVo dispatchVo) { public JsonResult<?> batchFinishDispatch(@RequestBody @Validated EbikeBatchDispatchVo dispatchVo) {
ebikeBikeOrderService.batchFinishDispatch(dispatchVo); ebikeBikeOrderService.batchFinishDispatch(dispatchVo);
return JsonResult.success(); return JsonResult.success();

3
ebike-operations/src/main/java/com/cdzy/operations/model/vo/DoneInspectionVo.java
View File

@ -28,5 +28,8 @@ public class DoneInspectionVo {
@NotNull(message = "是否上报故障不能为空") @NotNull(message = "是否上报故障不能为空")
private Boolean isFault; private Boolean isFault;
@NotNull(message = "巡检目标不能为空")
private List<Integer> parts;
private String remarks; private String remarks;
} }

9
ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeOrderServiceImpl.java
View File

@ -43,7 +43,6 @@ import static com.cdzy.operations.model.entity.table.EbikeBikeOrderTableDef.EBIK
import static com.cdzy.operations.model.entity.table.EbikeBorrowBatteryRecordTableDef.EBIKE_BORROW_BATTERY_RECORD; import static com.cdzy.operations.model.entity.table.EbikeBorrowBatteryRecordTableDef.EBIKE_BORROW_BATTERY_RECORD;
import static com.cdzy.operations.model.entity.table.EbikeEcuInfoTableDef.EBIKE_ECU_INFO; import static com.cdzy.operations.model.entity.table.EbikeEcuInfoTableDef.EBIKE_ECU_INFO;
import static com.cdzy.operations.model.entity.table.EbikeOrderFileTableDef.EBIKE_ORDER_FILE; import static com.cdzy.operations.model.entity.table.EbikeOrderFileTableDef.EBIKE_ORDER_FILE;
import static com.cdzy.operations.model.entity.table.EbikeOrderPartTableDef.EBIKE_ORDER_PART;
import static com.cdzy.operations.model.entity.table.EbikeSiteTableDef.EBIKE_SITE; import static com.cdzy.operations.model.entity.table.EbikeSiteTableDef.EBIKE_SITE;
/** /**
@ -102,9 +101,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
@Resource @Resource
private EbikeOrderFileMapper ebikeOrderFileMapper; private EbikeOrderFileMapper ebikeOrderFileMapper;
@Resource
private EbikeOrderPartMapper ebikeOrderPartMapper;
@Resource @Resource
private EbikeDispatchConfigurationMapper ebikeDispatchConfigurationMapper; private EbikeDispatchConfigurationMapper ebikeDispatchConfigurationMapper;
@ -670,10 +666,7 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
.where(EBIKE_ORDER_FILE.ORDER_ID.eq(bikeOrder.getOrderId())); .where(EBIKE_ORDER_FILE.ORDER_ID.eq(bikeOrder.getOrderId()));
List<String> list = ebikeOrderFileMapper.selectListByQueryAs(queryWrapper, String.class); List<String> list = ebikeOrderFileMapper.selectListByQueryAs(queryWrapper, String.class);
queryWrapper.clear(); List<Integer> parts = inspectionVo.getParts();
queryWrapper.select(EBIKE_ORDER_PART.ORDER_PART)
.where(EBIKE_ORDER_PART.ORDER_ID.eq(bikeOrder.getOrderId()));
List<Integer> parts = ebikeOrderPartMapper.selectListByQueryAs(queryWrapper, Integer.class);
EbikeBikeOrder ebikeBikeOrder = EbikeBikeOrder.builder() EbikeBikeOrder ebikeBikeOrder = EbikeBikeOrder.builder()
.bikeCode(bikeInfo.getBikeCode()) .bikeCode(bikeInfo.getBikeCode())