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

0924

Browse Source
This commit is contained in:
Lx 2025-09-24 17:41:06 +08:00
parent 2626db42e8
commit 174eff8028
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueInfoController.java
View File

@ -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("已转维修，请勿重复操作");
@ -369,7 +370,10 @@ public class RescueInfoController extends BaseController {
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);
}

4
dl-module-rescue/src/main/resources/mapper/rescue/RescueDriverInfoMapper.xml
View File

@ -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
</select>
<select id="listDispatchDriverByRescueId" resultType="cn.iocoder.yudao.module.rescue.domain.DriverInfo">