weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev' into nanguangmall

Browse Source
This commit is contained in:
赵辉
2025-12-10 09:28:06 +08:00
parent 7b10ff2b25 1b8a0eb8a4
commit df299a21ae
158 changed files with 4032 additions and 324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml
+45 -45
View File
@@ -78,13 +78,13 @@
ude.driver_enterprise_license_long,
ude.driver_enterprise_fill,
ude.driver_enterprise_fill_time,
GROUP_CONCAT(dvb.vehicle_license_plate_number) AS vehicleLicensePlateNumber,
WM_CONCAT(dvb.vehicle_license_plate_number) AS vehicleLicensePlateNumber,
dvb.vehicle_id ,
GROUP_CONCAT(m.motorcade_name) AS driverTeamName,
WM_CONCAT(m.motorcade_name) AS driverTeamName,
ud.driver_enterprise_name companyName
FROM
`user_driver` a
LEFT JOIN `user` b ON a.user_id = b.user_id AND b.del_flag = 1
user_driver a
LEFT JOIN "USER" b ON a.user_id = b.user_id AND b.del_flag = 1
LEFT JOIN user_driver_enterprise ude ON a.user_id = ude.user_id AND ude.del_flag = 1
LEFT JOIN driver_vehicle_bind dvb ON a.user_id = dvb.user_id AND dvb.del_flag = 1
LEFT JOIN motorcade m ON a.driver_id = m.motorcade_header_id AND m.del_flag = 1
@@ -107,7 +107,7 @@
a.driver_license_back_url,
a.driver_license_number,
a.driver_license_long,
a.driver_work_license_authority_code,
cast(a.driver_work_license_authority_code as BIGINT) as driver_work_license_authority_code,
a.driver_work_license_authority_name,
a.driver_work_license_number,
a.driver_work_license_type_id,
@@ -187,14 +187,14 @@
ude.driver_corp_idcard_number,
r.roleName,
dvb.vehicle_id,
GROUP_CONCAT(DISTINCT dvb.vehicle_license_plate_number ) AS vehicleLicensePlateNumber,
GROUP_CONCAT(DISTINCT m.motorcade_name ) AS driverTeamName
WM_CONCAT(DISTINCT dvb.vehicle_license_plate_number ) AS vehicleLicensePlateNumber,
WM_CONCAT(DISTINCT m.motorcade_name ) AS driverTeamName
FROM
user b
"USER" b
LEFT JOIN (
SELECT
user_id,
GROUP_CONCAT( DISTINCT r.role_name SEPARATOR '&' ) roleName
LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName
FROM
role r
LEFT JOIN user_role ur ON r.role_id = ur.role_id
@@ -302,11 +302,11 @@
ude.driver_corp_legal_name,
ude.driver_corp_name,
ude.driver_corp_idcard_number,
GROUP_CONCAT(dvb.vehicle_license_plate_number) AS vehicleLicensePlateNumber,
GROUP_CONCAT(m.motorcade_name) AS driverTeamName,
WM_CONCAT(dvb.vehicle_license_plate_number) AS vehicleLicensePlateNumber,
WM_CONCAT(m.motorcade_name) AS driverTeamName,
md.motorcade_id motorcade_header_id
FROM `user` b
LEFT JOIN `user_driver` a ON a.user_id = b.user_id AND b.del_flag = 1
FROM "USER" b
LEFT JOIN user_driver a ON a.user_id = b.user_id AND b.del_flag = 1
LEFT JOIN user_driver_enterprise ude ON a.user_id = ude.user_id AND ude.del_flag = 1
LEFT JOIN driver_vehicle_bind dvb ON a.user_id = dvb.user_id AND dvb.del_flag = 1
LEFT JOIN motorcade m ON a.driver_id = m.motorcade_header_id AND m.del_flag = 1
@@ -316,7 +316,7 @@
<select id="selectUserDriverByUserId" parameterType="java.lang.Long" resultType="java.lang.Long">
SELECT a.driver_id
FROM `user_driver` a
FROM user_driver a
WHERE a.del_flag = 1
AND a.user_id = #{values}
</select>
@@ -325,9 +325,9 @@
SELECT
u.user_name
FROM
`user_driver` a
user_driver a
LEFT JOIN
`user` u
"USER" u
ON u.user_id = a.user_id AND u.del_flag = 1
WHERE
a.del_flag = 1
@@ -346,8 +346,8 @@
resultType = "java.lang.Integer">
select count(1)
from ( select b.user_id
from user b
left join (select user_id, GROUP_CONCAT(r.role_name separator '&amp;') roleName
from "USER" b
left join (select user_id, WM_CONCAT(r.role_name separator '&amp;') roleName
from role r
left join user_role ur on r.role_id = ur.role_id and ur.del_flag = 1
where r.del_flag = 1
@@ -414,8 +414,8 @@
b.user_area_address,
b.user_remark,
dvb.vehicle_license_plate_number
FROM `user_driver` a
LEFT JOIN `user` b ON a.user_id = b.user_id
FROM user_driver a
LEFT JOIN "USER" b ON a.user_id = b.user_id
LEFT JOIN driver_vehicle_bind dvb ON dvb.driver_bind_id = b.user_id AND dvb.del_flag = 1 AND default_flag = 1
WHERE a.del_flag = 1
AND b.del_flag = 1
@@ -461,8 +461,8 @@
a.user_id,
a.driver_fill
FROM
`user_driver` a
LEFT JOIN `user` b ON a.user_id = b.user_id
user_driver a
LEFT JOIN "USER" b ON a.user_id = b.user_id
AND b.del_flag = 1
WHERE
a.del_flag = 1
@@ -525,8 +525,8 @@
b.user_name,
b.user_account
FROM
`user_driver` a
LEFT JOIN `user` b ON a.user_id = b.user_id AND b.del_flag = 1
user_driver a
LEFT JOIN "USER" b ON a.user_id = b.user_id AND b.del_flag = 1
WHERE
a.del_flag = 1
AND a.driver_id IN
@@ -722,7 +722,7 @@
SELECT
m.motorcade_header_id,
md.user_id,
GROUP_CONCAT( c.vehicle_license_plate_number ) AS vehicleLicensePlateNumber,
WM_CONCAT( c.vehicle_license_plate_number ) AS vehicleLicensePlateNumber,
u.user_phone,
u.user_name,
u.avatar,
@@ -734,7 +734,7 @@
AND c.del_flag = 1
LEFT JOIN user_driver ud ON md.user_id = ud.user_id
AND ud.del_flag = 1
LEFT JOIN `user` u ON ud.user_id = u.user_id
LEFT JOIN "USER" u ON ud.user_id = u.user_id
LEFT JOIN motorcade m ON md.motorcade_id = m.motorcade_id
WHERE
md.del_flag = 1
@@ -756,7 +756,7 @@
SELECT
vehicle_id
FROM
`driver_vehicle_bind`
driver_vehicle_bind
WHERE
del_flag = 1
and driver_id = #{values}
@@ -769,9 +769,9 @@
u.user_name,
u.user_auth_status
FROM
`user_driver` d
user_driver d
LEFT JOIN
`user` u
"USER" u
ON d.user_id = u.user_id
LEFT JOIN
driver_vehicle_bind b
@@ -820,11 +820,11 @@
r.roleCode
FROM
user_driver ud
LEFT JOIN `user` u ON ud.user_id = u.user_id
LEFT JOIN "USER" u ON ud.user_id = u.user_id
AND u.del_flag = 1
LEFT JOIN (SELECT
user_id,
GROUP_CONCAT( DISTINCT r.role_code SEPARATOR '&amp;' ) roleCode
LISTAGG(DISTINCT r.role_code, '&amp;') WITHIN GROUP(ORDER BY r.role_code) AS roleCode
FROM
role r
LEFT JOIN user_role ur ON r.role_id = ur.role_id
@@ -858,7 +858,7 @@
FROM
user_driver d
LEFT JOIN driver_vehicle_bind dvb ON d.user_id = dvb.driver_bind_id AND dvb.del_flag = 1
LEFT JOIN `user` u ON d.user_id = u.user_id
LEFT JOIN "USER" u ON d.user_id = u.user_id
LEFT JOIN user_driver_enterprise ude ON d.user_driver_enterprise_id = ude.user_driver_enterprise_id
LEFT JOIN motorcade_driver md ON d.user_id = md.user_id and md.del_flag = 1
LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id
@@ -886,7 +886,7 @@
FROM
user_driver d
LEFT JOIN driver_vehicle_bind dvb ON d.user_id = dvb.driver_bind_id AND dvb.del_flag = 1
LEFT JOIN `user` u ON d.user_id = u.user_id
LEFT JOIN "USER" u ON d.user_id = u.user_id
LEFT JOIN user_driver_enterprise ude ON d.user_driver_enterprise_id = ude.user_driver_enterprise_id
LEFT JOIN motorcade_driver md ON d.user_id = md.user_id and md.del_flag = 1
LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id
@@ -914,7 +914,7 @@
FROM
user_driver d
LEFT JOIN driver_vehicle_bind dvb ON d.user_id = dvb.driver_bind_id AND dvb.del_flag = 1
LEFT JOIN `user` u ON d.user_id = u.user_id
LEFT JOIN "USER" u ON d.user_id = u.user_id
LEFT JOIN motorcade_driver md ON d.user_id = md.user_id and md.del_flag = 1
LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id
WHERE
@@ -952,7 +952,7 @@
u.user_account,
ude.user_driver_enterprise_id,
ude.driver_enterprise_name
from user u
from "USER" u
left join user_driver ud on ud.user_id = u.user_id and u.del_flag = 1
left join user_driver_enterprise ude
on u.user_id = ude.user_id and ude.del_flag = 1
@@ -993,7 +993,7 @@
u.user_auth_status userAuthStatus,
u.user_birthday userBirthday,
concat(ude.driver_captain_fill,'') driverCaptainFill
from user u
from "USER" u
left join user_driver_enterprise ude on u.user_id = ude.user_id and ude.del_flag = 1
where u.del_flag = 1
and ude.driver_captain_fill = 3
@@ -1012,7 +1012,7 @@
dvb.vehicle_type_name,
ud.driver_fill
from user_driver ud
left join user u on ud.user_id = u.user_id
left join "USER" u on ud.user_id = u.user_id
left join driver_vehicle_bind dvb on ud.user_id = dvb.driver_bind_id and dvb.del_flag = 1 and dvb.default_flag = 1
where ud.del_flag = 1 and u.del_flag = 1
<if test="userDriverDO.topOrganizationId != null and userDriverDO.topOrganizationId != ''">
@@ -1037,9 +1037,9 @@
<select id="getDriverCountByMatter" parameterType="com.mhd.common.core.domain.todo.StatisticalMattersDo"
resultType = "java.lang.Integer">
select
a.`count` + b.`count`
from (select count(1) as `count`
from user u
a.count + b.count
from (select count(1) as count
from "USER" u
left join user_driver ud on u.user_id = ud.user_id
<where>
u.del_flag = 1
@@ -1054,8 +1054,8 @@
ifnull(
sum(case when ude.driver_enterprise_fill = 2 then 1 end)
+
sum(case when ude.driver_captain_fill = 2 then 1 end), 0) as `count`
from user u
sum(case when ude.driver_captain_fill = 2 then 1 end), 0) as count
from "USER" u
left join user_driver_enterprise ude on u.user_id = ude.user_id
<where>
u.del_flag = 1
@@ -1077,7 +1077,7 @@
ude.driver_enterprise_name,
ude.driver_enterprise_code
from user_driver ud
left join user u on u.user_id = ud.user_id
left join "USER" u on u.user_id = ud.user_id
left join user_driver_enterprise ude
on ude.user_driver_enterprise_id = ud.user_driver_enterprise_id and ude.del_flag = 1 and
driver_type = 1
@@ -1107,7 +1107,7 @@
ude.driver_enterprise_fill,
ud.driver_captain_fill
FROM
user b
"USER" b
LEFT JOIN user_driver a ON a.user_id = b.user_id
LEFT JOIN user_driver_enterprise ude ON b.user_id = ude.user_id
AND ude.driver_type = 1
@@ -1139,7 +1139,7 @@
a.user_id,
a.create_by
FROM
user u
"USER" u
LEFT JOIN user_driver a ON u.user_id = a.user_id
LEFT JOIN motorcade_driver md ON a.user_id = md.user_id
LEFT JOIN motorcade m ON m.motorcade_id = md.motorcade_id