From 174eff80285992e082ffda7d2350ca009c8de252 Mon Sep 17 00:00:00 2001 From: Lx <935448346@qq.com> Date: Wed, 24 Sep 2025 17:41:06 +0800 Subject: [PATCH] 0924 --- .../rescue/app/controller/admin/RescueInfoController.java | 8 ++++++-- .../resources/mapper/rescue/RescueDriverInfoMapper.xml | 4 ++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java index 249b3035..1cb92ee9 100644 --- a/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java +++ b/dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java @@ -350,6 +350,7 @@ public class RescueInfoController extends BaseController { @PostMapping("/toRepair") public CommonResult toRepair(@RequestBody RepairBookingRespVO repairBookingRespVO) { + LoginUser loginUser = SecurityFrameworkUtils.getLoginUser(); RescueInfo rescueInfo = rescueInfoService.getById(repairBookingRespVO.getRescueId()); /*if("1".equals(rescueInfo.getIsWeiXiu())){ return error("已转维修，请勿重复操作"); @@ -362,14 +363,17 @@ public class RescueInfoController extends BaseController { repairBooking.setSource("救援转维修"); repairBooking.setChannel(rescueInfo.getChannel()); repairBooking.setRepairType("06"); - repairBooking.setBookingTime(LocalDateTime.now() ); + repairBooking.setBookingTime(LocalDateTime.now()); repairBooking.setAdviserId(repairBookingRespVO.getAdviserId()); repairBooking.setAdviserName(repairBookingRespVO.getAdviserName()); repairBooking.setAdviserPhone(repairBookingRespVO.getAdviserPhone()); dlRepairBookingService.updateBooking(repairBooking); rescueInfo.setIsWeiXiu("1"); - rescueInfo.setZwxUserId(rescueInfoService.safeStringToLong(repairBookingRespVO.getAdviserId(), null)); +// rescueInfo.setZwxUserId(rescueInfoService.safeStringToLong(repairBookingRespVO.getAdviserId(), null)); + if (loginUser != null) { + rescueInfo.setZwxUserId(loginUser.getId()); + } rescueInfoService.updateRescueInfo(rescueInfo); return success(rescueInfo); } diff --git a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml index 0af4bbc1..d84680b2 100644 --- a/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml +++ b/dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml @@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" INNER JOIN rescue_driver_info rdi ON ri.id = rdi.rescue_id AND rdi.driver_accept = '2' AND rdi.deleted = '0' WHERE ri.deleted = '0' and - ri.is_revoke = '0' + ri.is_revoke = '0' and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null ORDER BY rdi.create_time desc @@ -153,7 +153,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" FROM `rescue_driver_info` rdi INNER JOIN rescue_info ri on rdi.rescue_id = ri.id - where rdi.deleted = 0 and rdi.driver_accept ='2' and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null + where rdi.deleted = 0 and ri.is_revoke = 0 and rdi.driver_accept ='2' and rdi.driver_id =#{driverId} and ri.rescue_status = '2' and ri.driver_id is null