dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: dianliang:763c6ce174e8064c2e124abaa269c7cb8cae40a6
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
...
compare: dianliang:f9cb1259ec941549070f23d0f164b26071bd03f2
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

2 Commits
763c6ce174 ... f9cb1259ec

Author SHA1 Message Date
PQZ
f9cb1259ec Merge branch 'master' of http://122.51.230.86:3000/dianliang/lanan-system 2024-09-25 21:12:34 +08:00
PQZ
ca2b865a11 1 2024-09-25 21:12:32 +08:00
2 changed files with 4 additions and 1 deletions
Show Stats Expand all files Collapse all files

1
dl-module-base/src/main/java/cn/iocoder/yudao/module/order/controller/admin/RepairOrderInfoController.java
View File

@ -58,7 +58,6 @@ public class RepairOrderInfoController {
*/ */
@PutMapping("/update") @PutMapping("/update")
@Operation(summary = "更新车辆信息") @Operation(summary = "更新车辆信息")
@PreAuthorize("@ss.hasPermission('base:car-main:update')")
public CommonResult<Boolean> updateCarMain(@RequestBody RepairOrderInfoSaveReqVO saveReqVO) { public CommonResult<Boolean> updateCarMain(@RequestBody RepairOrderInfoSaveReqVO saveReqVO) {
repairOrderInfoService.rechargeCallback(saveReqVO.getOrderNo()); repairOrderInfoService.rechargeCallback(saveReqVO.getOrderNo());
return success(true); return success(true);

4
dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
View File

@ -1,6 +1,7 @@
package cn.iocoder.yudao.module.booking.service.impl; package cn.iocoder.yudao.module.booking.service.impl;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils; import cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils;
import cn.iocoder.yudao.module.app.booking.vo.BookingQueryVO; import cn.iocoder.yudao.module.app.booking.vo.BookingQueryVO;
@ -107,6 +108,9 @@ public class DlRepairBookingServiceImpl extends ServiceImpl<DlRepairBookingMappe
@Override @Override
public List<BookingQueryVO> getBookingMap(List<String> ids){ public List<BookingQueryVO> getBookingMap(List<String> ids){
// 查预约记录 // 查预约记录
if (CollectionUtil.isEmpty(ids)){
return new ArrayList<>();
}
List<DlRepairBooking> dlRepairBookings = baseMapper.selectBatchIds(ids); List<DlRepairBooking> dlRepairBookings = baseMapper.selectBatchIds(ids);
List<BookingQueryVO> result = dlRepairBookings.stream().map(item -> BeanUtil.toBean(item, BookingQueryVO.class)).collect(Collectors.toList()); List<BookingQueryVO> result = dlRepairBookings.stream().map(item -> BeanUtil.toBean(item, BookingQueryVO.class)).collect(Collectors.toList());
// 查企业 // 查企业