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

Compare commits

base: attiya:a8b24cf4e345a8ca58605ce4f4112a39d91a3b7b99438bfb79994e5de28f8289
Branches Tags
attiya:main
attiya:dev
...
compare: attiya:689951e79c11dfb510de11ad1f93d36e9884d5c49597887cbcb98a45b80e063f
Branches Tags
attiya:main
attiya:dev

2 Commits
a8b24cf4e3 ... 689951e79c

Author SHA256 Message Date
PC
689951e79c Merge remote-tracking branch 'origin/main' 2026-01-20 13:54:42 +08:00
PC
21eaf7d2aa 完成巡检 2026-01-20 13:54:34 +08:00
3 changed files with 6 additions and 10 deletions
Show Stats 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 操作结果
*/
@GetMapping("batchFinishDispatch")
@PostMapping("batchFinishDispatch")
public JsonResult<?> batchFinishDispatch(@RequestBody @Validated EbikeBatchDispatchVo dispatchVo) {
ebikeBikeOrderService.batchFinishDispatch(dispatchVo);
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 = "是否上报故障不能为空")
private Boolean isFault;
@NotNull(message = "巡检目标不能为空")
private List<Integer> parts;
private String remarks;
}

11
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.EbikeEcuInfoTableDef.EBIKE_ECU_INFO;
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;
/**
@ -102,9 +101,6 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
@Resource
private EbikeOrderFileMapper ebikeOrderFileMapper;
@Resource
private EbikeOrderPartMapper ebikeOrderPartMapper;
@Resource
private EbikeDispatchConfigurationMapper ebikeDispatchConfigurationMapper;
@ -669,11 +665,8 @@ public class EbikeBikeOrderServiceImpl extends ServiceImpl<EbikeBikeOrderMapper,
queryWrapper.select(EBIKE_ORDER_FILE.FILE_URL)
.where(EBIKE_ORDER_FILE.ORDER_ID.eq(bikeOrder.getOrderId()));
List<String> list = ebikeOrderFileMapper.selectListByQueryAs(queryWrapper, String.class);
queryWrapper.clear();
queryWrapper.select(EBIKE_ORDER_PART.ORDER_PART)
.where(EBIKE_ORDER_PART.ORDER_ID.eq(bikeOrder.getOrderId()));
List<Integer> parts = ebikeOrderPartMapper.selectListByQueryAs(queryWrapper, Integer.class);
List<Integer> parts = inspectionVo.getParts();
EbikeBikeOrder ebikeBikeOrder = EbikeBikeOrder.builder()
.bikeCode(bikeInfo.getBikeCode())