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

Merge branch 'rescue'

Browse Source
This commit is contained in:
sunhaoyuan 2025-11-24 17:15:21 +08:00
commit ac54a7735c
2 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/domain/RescueInfo.java
View File

@ -318,6 +318,13 @@ public class RescueInfo extends TenantBaseDO
*/ */
private String secondDispatchPhone; private String secondDispatchPhone;
/** 指派给二级调度id */
private String assignDispatchId;
/** 指派给二级调度姓名 */
private String assignDispatchName;
/** 指派给二级调度手机号 */
private String assignDispatchPhone;
/** /**
* 来源 * 来源
*/ */

29
dl-module-rescue/src/main/resources/mapper/rescue/RescueInfoMapper.xml
View File

@ -167,7 +167,12 @@
<where> <where>
1 = 1 1 = 1
and ri.deleted = '0' AND ri.is_revoke = '0' and ri.deleted = '0' AND ri.is_revoke = '0'
and ri.second_dispatch_id = #{map.userId} <!-- 根据 ri.creator 是否等于当前 userId，决定用 second_dispatch_id 还是 assign_dispatch_id -->
AND (
(ri.creator = #{map.userId} AND ri.second_dispatch_id = #{map.userId})
OR
(ri.creator != #{map.userId} AND ri.assign_dispatch_id = #{map.userId})
)
<if test="map.rescueStatus != null"> <if test="map.rescueStatus != null">
<choose> <choose>
<when test="map.rescueStatus == '1'.toString()"> <when test="map.rescueStatus == '1'.toString()">
@ -970,7 +975,13 @@
FROM rescue_info ri FROM rescue_info ri
left join rescue_order_info roi on roi.rescue_info_id = ri.id AND roi.deleted = 0 left join rescue_order_info roi on roi.rescue_info_id = ri.id AND roi.deleted = 0
where 1 = 1 AND ri.deleted = 0 AND ri.is_revoke = 0 where 1 = 1 AND ri.deleted = 0 AND ri.is_revoke = 0
AND ri.second_dispatch_id = #{map.userId} <!-- AND ri.second_dispatch_id = #{map.userId} -->
<!-- 根据 ri.creator 是否等于当前 userId，决定用 second_dispatch_id 还是 assign_dispatch_id -->
AND (
(ri.creator = #{map.userId} AND ri.second_dispatch_id = #{map.userId})
OR
(ri.creator != #{map.userId} AND ri.assign_dispatch_id = #{map.userId})
)
<if test="map.deptList != null and map.deptList.size()>0"> <if test="map.deptList != null and map.deptList.size()>0">
and ri.dept_id in and ri.dept_id in
<foreach collection="map.deptList" separator="," item="item" open="(" close=")"> <foreach collection="map.deptList" separator="," item="item" open="(" close=")">
@ -1778,7 +1789,12 @@
AND ri.deleted = 0 and ri.is_revoke = 0 AND ri.deleted = 0 and ri.is_revoke = 0
AND ri.driver_name IS NOT NULL AND ri.driver_name IS NOT NULL
AND ri.driver_id IS NOT NULL AND ri.driver_id IS NOT NULL
AND ri.second_dispatch_id = #{vo.secondUserId} <!-- AND ri.second_dispatch_id = #{vo.secondUserId} -->
AND (
(ri.creator = #{vo.secondUserId} AND ri.second_dispatch_id = #{vo.secondUserId})
OR
(ri.creator != #{vo.secondUserId} AND ri.assign_dispatch_id = #{vo.secondUserId})
)
LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0 LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
WHERE di.deleted = 0 WHERE di.deleted = 0
AND FIND_IN_SET(#{vo.secondUserId}, di.second_dispatcher_id) > 0 AND FIND_IN_SET(#{vo.secondUserId}, di.second_dispatcher_id) > 0
@ -1819,7 +1835,12 @@
INNER JOIN driver_info di ON rdcr.driver_id = di.id AND di.deleted = 0 INNER JOIN driver_info di ON rdcr.driver_id = di.id AND di.deleted = 0
LEFT JOIN rescue_info ri ON ri.driver_car_num = rci.rescue_car_num LEFT JOIN rescue_info ri ON ri.driver_car_num = rci.rescue_car_num
AND ri.deleted = 0 and ri.is_revoke = 0 AND ri.deleted = 0 and ri.is_revoke = 0
AND ri.second_dispatch_id = #{vo.secondUserId} <!-- AND ri.second_dispatch_id = #{vo.secondUserId} -->
AND (
(ri.creator = #{vo.secondUserId} AND ri.second_dispatch_id = #{vo.secondUserId})
OR
(ri.creator != #{vo.secondUserId} AND ri.assign_dispatch_id = #{vo.secondUserId})
)
LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0 LEFT JOIN rescue_order_info roi ON roi.rescue_info_id = ri.id AND roi.deleted = 0
WHERE rci.deleted = 0 WHERE rci.deleted = 0
AND FIND_IN_SET(#{vo.secondUserId}, di.second_dispatcher_id) > 0 AND FIND_IN_SET(#{vo.secondUserId}, di.second_dispatcher_id) > 0