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

Merge branch 'dm_20251204' into dev

Browse Source 
# Conflicts:
#	mhd-user-center/src/main/resources/mapper/UserMapper.xml
#	mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
This commit is contained in:
王奎兴
2025-12-06 22:15:26 +08:00
parent 8527d24d48 5b2212d5db
commit 2a1e542704
63 changed files with 314 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/resources/mapper/CustomAuthRoleMapper.xml
+2 -2
View File
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.update_by,
a.update_by_name
FROM
`custom_auth_role` a
custom_auth_role a
WHERE
a.del_flag = 1
</sql>
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="deleteCustomAuthRoleByRoleId" parameterType="com.mhd.user.domain.roleAggregate.repository.todo.CustomAuthDO">
DELETE
FROM
`custom_auth_role` a
custom_auth_role a
WHERE
a.del_flag = 1
<include refid="common_where"/>
mhd-user-center/src/main/resources/mapper/CustomAuthUserMapper.xml
+2 -2
View File
@@ -19,7 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.update_by,
a.update_by_name
FROM
`custom_auth_user` a
custom_auth_user a
WHERE
a.del_flag = 1
</sql>
@@ -41,7 +41,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="deleteCustomAuthUserByUserId" parameterType="com.mhd.user.domain.roleAggregate.repository.todo.CustomAuthDO">
DELETE
FROM
`custom_auth_user` a
custom_auth_user a
WHERE
a.del_flag = 1
<include refid="common_where"/>
mhd-user-center/src/main/resources/mapper/DriverCurrentPositionMapper.xml
+4 -4
View File
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.createTime,
a.user_id
FROM
( SELECT MAX( create_time ) createTime, user_id FROM `driver_current_position` GROUP BY user_id ) a
( SELECT MAX( create_time ) createTime, user_id FROM driver_current_position GROUP BY user_id ) a
) u
WHERE
u.excTime = 1
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
address,
license_plate
FROM
`driver_current_position`
driver_current_position
WHERE
create_Time >= #{time}
AND license_plate IS NOT NULL
@@ -96,7 +96,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
address,
license_plate
FROM
`driver_current_position`
driver_current_position
WHERE
create_Time <![CDATA[<]]> #{time}
AND license_plate IS NOT NULL
@@ -108,7 +108,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.user_name,
b.user_phone
FROM driver_current_position a
left join user b on a.user_id = b.user_id
left join "USER" b on a.user_id = b.user_id
WHERE license_plate = #{licensePlate}
ORDER BY create_by DESC
LIMIT 1
mhd-user-center/src/main/resources/mapper/DriverVehicleBindMapper.xml
+4 -4
View File
@@ -48,9 +48,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.user_name AS userName,
u.user_phone AS userPhone
FROM
`driver_vehicle_bind` b
driver_vehicle_bind b
LEFT JOIN
`user` u
"USER" u
ON b.user_id = u.user_id
WHERE
vehicle_id = #{values}
@@ -66,8 +66,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.vehicle_id,
b.vehicle_license_plate_number
FROM
`driver_vehicle_bind` b
LEFT JOIN `user` u ON b.driver_bind_id = u.user_id
driver_vehicle_bind b
LEFT JOIN "USER" u ON b.driver_bind_id = u.user_id
WHERE
b.del_flag = 1
<include refid="where_two"></include>
mhd-user-center/src/main/resources/mapper/MotorcadeDriverMapper.xml
+2 -2
View File
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
d.motorcade_id
FROM
`motorcade` d
motorcade d
WHERE
d.del_flag = 1 AND
d.motorcade_header_id = #{values}
@@ -18,7 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.user_id,
b.create_by
FROM
`motorcade_driver` a
motorcade_driver a
left join user_driver b on a.user_id = b.user_id
WHERE
a.del_flag = 1
mhd-user-center/src/main/resources/mapper/MotorcadeMapper.xml
+6 -6
View File
@@ -149,7 +149,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
u.user_id,
COUNT(b.vehicle_id) AS vehicle_num
FROM
`user_driver` u
user_driver u
LEFT JOIN
driver_vehicle_bind b
ON u.user_id = b.driver_bind_id and b.del_flag = 1
@@ -254,12 +254,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
m.*,
COUNT( d.user_id ) AS driver_num,
SUM( dvb.vehicle_num ) AS vehicle_num,
GROUP_CONCAT(d.user_id) AS userIds,
WM_CONCAT(d.user_id) AS userIds,
u.user_phone
FROM
motorcade m
LEFT JOIN motorcade_driver d ON m.motorcade_id = d.motorcade_id AND d.del_flag = 1
LEFT JOIN `user` u ON u.user_id = m.motorcade_header_id
LEFT JOIN "USER" u ON u.user_id = m.motorcade_header_id
LEFT JOIN (
SELECT
u.user_id,
@@ -312,7 +312,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mc.file_id,
mc.agreement_url_pdf
from motorcade_driver md
left join user u on md.user_id = u.user_id and u.del_flag = 1
left join "USER" u on md.user_id = u.user_id and u.del_flag = 1
left join user_driver ud on ud.user_id = md.user_id and ud.del_flag = 1
left join driver_vehicle_bind dvb
on md.user_id = dvb.driver_bind_id and dvb.del_flag = 1
@@ -332,10 +332,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ud.*,
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
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
mhd-user-center/src/main/resources/mapper/MotorcadeRecordMapper.xml
+2 -2
View File
@@ -103,7 +103,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
motorcade_record mr
LEFT JOIN user_driver ud ON mr.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 driver_vehicle_bind dvb ON dvb.user_id = mr.user_id
AND dvb.del_flag = 1
WHERE
@@ -136,7 +136,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mr.motorcade_id,
mr.motorcade_name
FROM motorcade_record mr
LEFT JOIN `user` u ON mr.user_id = u.user_id
LEFT JOIN "USER" u ON mr.user_id = u.user_id
LEFT JOIN driver_vehicle_bind dvb ON dvb.driver_bind_id = mr.user_id AND dvb.default_flag = 1
AND dvb.del_flag = 1
WHERE mr.del_flag = 1
mhd-user-center/src/main/resources/mapper/RoleMapper.xml
+8 -8
View File
@@ -15,7 +15,7 @@
a.role_remark,
a.role_data_scope,
a.role_status
FROM `role` a
FROM role a
WHERE a.del_flag = 1
</sql>
@@ -44,9 +44,9 @@
a.role_grade,
COUNT(DISTINCT u.user_id) roleUserCount
FROM
`role` a
role a
LEFT JOIN user_role b on a.role_id = b.role_id
left join user u on b.user_id = u.user_id and u.del_flag = 1
left join "USER" u on b.user_id = u.user_id and u.del_flag = 1
WHERE
a.del_flag = 1
<include refid="common_where"></include>
@@ -67,7 +67,7 @@
a.role_data_scope,
a.role_status
FROM
`role` a
role a
WHERE
a.del_flag=1
<include refid="common_where"></include>
@@ -86,7 +86,7 @@
a.role_remark,
a.role_data_scope,
a.role_status
FROM `role` a
FROM role a
WHERE a.role_id = #{value}
</select>
<select id="selectByRoleId" parameterType="com.mhd.common.core.domain.po.RolePO"
@@ -159,7 +159,7 @@
<!-- 根据组织ID物理删除角色 -->
<select id="deleteByOrganizationId" parameterType="java.lang.Long">
DELETE
FROM `role` a
FROM role a
WHERE a.del_flag = 1
and a.organization_id = #{value}
</select>
@@ -167,9 +167,9 @@
<!-- 根据IDs合集查询角色名称 -->
<select id="findRoleNameByRoleIds" parameterType="java.lang.Long" resultType="java.lang.String">
SELECT
GROUP_CONCAT( a.role_name SEPARATOR ';' ) AS roleName
LISTAGG(DISTINCT a.role_name, ';') WITHIN GROUP(ORDER BY a.role_name) AS roleName
FROM
`role` a
role a
WHERE
a.del_flag = 1
AND a.role_id IN
mhd-user-center/src/main/resources/mapper/RoleMenuMapper.xml
+2 -2
View File
@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.role_id,
a.menu_id
FROM
`role_menu` a
role_menu a
WHERE
a.del_flag = 1
</sql>
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="removeByRoleId" parameterType="java.lang.Long">
DELETE
FROM
`role_menu` a
role_menu a
WHERE
a.del_flag = 1
and a.role_id = #{roleId}
mhd-user-center/src/main/resources/mapper/UserDataPermissionMapper.xml
+2 -2
View File
@@ -14,7 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.user_data_personal_status,
a.user_data_organization_status
FROM
`user_data_permission` a
user_data_permission a
</sql>
<select id="selectList" parameterType="com.mhd.user.domain.userAggregate.repository.todo.UserDataPermissionDO"
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="deleteByUserId" parameterType="com.mhd.user.domain.userAggregate.repository.todo.UserDataPermissionDO" >
DELETE
FROM
`user_data_permission` a
user_data_permission a
WHERE
a.del_flag = 1
and a.user_id = #{userId}
mhd-user-center/src/main/resources/mapper/UserDriverEnterpriseMapper.xml
+2 -2
View File
@@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
a.*
from user_driver_enterprise a
LEFT JOIN `user` b ON a.user_id = b.user_id AND b.del_flag = 1
LEFT JOIN "USER" b ON a.user_id = b.user_id AND b.del_flag = 1
where
a.del_flag = 1 and a.driver_type = 1
</sql>
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
a.*
from user_driver_enterprise a
LEFT JOIN `user` b ON a.user_id = b.user_id AND b.del_flag = 1
LEFT JOIN "USER" b ON a.user_id = b.user_id AND b.del_flag = 1
where
a.del_flag = 1 and a.driver_type = 2
</sql>
mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml
+44 -44
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
@@ -186,14 +186,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 '&amp;' ) roleName
LISTAGG(DISTINCT r.role_name, '&amp;') WITHIN GROUP(ORDER BY r.role_name) AS roleName
FROM
role r
LEFT JOIN user_role ur ON r.role_id = ur.role_id
@@ -300,11 +300,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
@@ -314,7 +314,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>
@@ -323,9 +323,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
@@ -344,8 +344,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
@@ -412,8 +412,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
@@ -459,8 +459,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
@@ -523,8 +523,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
@@ -720,7 +720,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,
@@ -732,7 +732,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
@@ -754,7 +754,7 @@
SELECT
vehicle_id
FROM
`driver_vehicle_bind`
driver_vehicle_bind
WHERE
del_flag = 1
and driver_id = #{values}
@@ -767,9 +767,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
@@ -818,11 +818,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
@@ -856,7 +856,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
@@ -884,7 +884,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
@@ -912,7 +912,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
@@ -950,7 +950,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
@@ -991,7 +991,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
@@ -1010,7 +1010,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 != ''">
@@ -1035,9 +1035,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
@@ -1052,8 +1052,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
@@ -1075,7 +1075,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
@@ -1105,7 +1105,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
@@ -1137,7 +1137,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
mhd-user-center/src/main/resources/mapper/UserMapper.xml
+17 -22
View File
@@ -8,21 +8,16 @@
SELECT a.user_id,
a.top_organization_id,
a.organization_id,
a.organization_name,
a.role_id,
a.role_name,
a.user_phone,
a.role_code,
a.user_phone,
a.user_name,
a.user_account,
a.last_login_time,
COALESCE(CONCAT( a.user_name, ' ', a.user_phone, ' ', a.user_account)
,a.user_name, ' ', a.user_phone, ' ', a.user_account) AS userShowName,
a.user_member_code,
a.user_password,
a.user_salt,
a.role_name,
a.organization_name,
a.user_pay_password,
a.user_idcard_number,
@@ -75,8 +70,8 @@
a.department_id,
a.ding_user_id,
a.ding_dept_id,
a.validity_period_management,a.salesperson_nc_code,a.document_preparer_nc_code
FROM `user` a
a.validity_period_management
FROM "USER" a
where a.del_flag = 1
</sql>
@@ -99,9 +94,9 @@
u.user_idcard_number as userIdcardNumber,
u.top_organization_id AS topOrganizationId
FROM
`user_shipper` s
user_shipper s
LEFT JOIN
`user` u
user u
ON u.user_id = s.user_id
<where>
<if test="topOrganizationId != null "> and u.top_organization_id = #{topOrganizationId}</if>
@@ -120,9 +115,9 @@
u.user_idcard_number as userIdcardNumber,
u.top_organization_id AS topOrganizationId
FROM
`user_shipper` s
user_shipper s
LEFT JOIN
`user` u
user u
ON u.user_id = s.user_id and u.del_flag = 1
<where>
s.del_flag = 1 and s.shipper_fill = 3
@@ -416,7 +411,7 @@
a.user_account,
a.avatar
FROM
`user` a
user a
WHERE
a.del_flag = 1
<include refid="common_where1"></include>
@@ -451,7 +446,7 @@
u.user_birthday,
ude.driver_captain_fill
from user_driver_enterprise ude
left join user u on ude.user_id = u.user_id and u.del_flag = 1
left join "USER" u on ude.user_id = u.user_id and u.del_flag = 1
where ude.del_flag = 1
and ude.driver_type = 2
and u.user_id = #{userId}
@@ -538,7 +533,7 @@
when datediff(dvb.vehicle_checkout_period_validity, NOW()) &lt; 0 then 2
else 0
end) as drivingPermitExpStatus
from user u
from "USER" u
left join user_driver ud on u.user_id = ud.user_id and ud.del_flag = 1
left join user_driver_enterprise ude on u.user_id = ude.user_id and ude.del_flag = 1 and ude.driver_type = 1
left join driver_vehicle_bind dvb
@@ -663,7 +658,7 @@
us.shipper_enterprise_name,
us.shipper_type
FROM
`user` u
user u
LEFT JOIN user_shipper us ON u.user_id = us.user_id
WHERE
u.del_flag = 1
@@ -681,7 +676,7 @@
ude.driver_enterprise_name,
ude.driver_type
FROM
`user` u
user u
LEFT JOIN user_driver_enterprise ude ON u.user_id = ude.user_id
WHERE
u.del_flag = 1
@@ -705,7 +700,7 @@
a.user_account,
a.avatar
FROM
`user` a
user a
WHERE
a.del_flag = 1
and a.top_organization_id = #{topOrganizationId}
@@ -714,9 +709,9 @@
<select id="findAllShipperInfo" resultType="com.mhd.user.interfaces.vo.QueryAllShipperInfoVo">
SELECT u.user_id, u.user_name, u.user_area_address, u.user_area_county_id, u.user_area_name ,u.user_phone,u.has_default_address,b.shipper_id,b.shipper_enterprise_name
FROM `user` u
LEFT JOIN `user_shipper` b ON u.user_id = b.user_id
left join (select user_id, GROUP_CONCAT(r.role_name separator '&amp;') roleName
FROM "USER" u
LEFT JOIN user_shipper b ON u.user_id = b.user_id
left join (select user_id, LISTAGG(r.role_name, '&amp;') WITHIN GROUP(ORDER BY r.role_name) AS 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
@@ -738,9 +733,9 @@
SELECT
user_shipper.shipper_enterprise_name
FROM
`user` u
"USER" u
INNER JOIN
`user_shipper` ON u.user_id = user_shipper.user_id
user_shipper ON u.user_id = user_shipper.user_id
WHERE
u.del_flag = 1
AND user_shipper.del_flag = 1
mhd-user-center/src/main/resources/mapper/UserMenuMapper.xml
+2 -2
View File
@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.user_id,
a.menu_id
FROM
`user_menu` a
user_menu a
</sql>
<select id="selectList" parameterType="com.mhd.user.domain.userAggregate.repository.todo.UserMenuDo"
@@ -50,7 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="deleteByUserId" parameterType="java.lang.Long" >
DELETE
FROM
`user_menu` a
user_menu a
WHERE
a.del_flag = 1
and a.user_id = #{value}
mhd-user-center/src/main/resources/mapper/UserRoleMapper.xml
+3 -3
View File
@@ -10,7 +10,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.user_id,
a.role_id
FROM
`user_role` a
user_role a
</sql>
<select id="userRoleMenuList" resultType="com.mhd.common.core.domain.po.UserRoleMenuPO">
SELECT
@@ -40,7 +40,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="deleteByUserId" parameterType="java.lang.Long" >
DELETE
FROM
`user_role` a
user_role a
WHERE
a.del_flag = 1
and a.user_id = #{userId}
@@ -73,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="getUserIdByRoleCode" resultType="java.lang.Long">
select
u.user_id
from user u
from "USER" u
left join user_role ur on u.user_id = ur.user_id and ur.del_flag = 1
left join role r on r.role_id = ur.role_id and r.del_flag = 1
<where>
mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+12 -15
View File
@@ -65,8 +65,8 @@
a.esign_auth_status,
a.esign_enterprise_status,
a.esign_seal_auth_id
FROM `user_shipper` a
LEFT JOIN `user` b ON a.user_id = b.user_id
FROM user_shipper a
LEFT JOIN "USER" b ON a.user_id = b.user_id
WHERE a.del_flag = 1
AND b.del_flag = 1
</sql>
@@ -139,6 +139,10 @@
b.monthly_settlement_flag,
a.user_auth_status,
b.original_receipt_flag,
b.freight_node
FROM "USER" a
LEFT JOIN user_shipper b ON a.user_id = b.user_id
left join (select user_id, LISTAGG(DISTINCT r.role_name, '&amp;') WITHIN GROUP(ORDER BY r.role_name) AS roleName
b.freight_node,b.customer_nc_code
FROM `user` a
LEFT JOIN `user_shipper` b ON a.user_id = b.user_id
@@ -186,15 +190,15 @@
SELECT
b.shipper_id,
a.user_id,
GROUP_CONCAT(r.role_code) AS roleCode,
WM_CONCAT(r.role_code) AS roleCode,
b.shipper_fill,
b.shipper_enterprise_fill,
a.business_type
FROM
`user` a
LEFT JOIN `user_shipper` b ON b.user_id = a.user_id
user a
LEFT JOIN user_shipper b ON b.user_id = a.user_id
LEFT JOIN user_role ur ON b.user_id = ur.user_id
LEFT JOIN `role` r ON ur.role_id = r.role_id
LEFT JOIN role r ON ur.role_id = r.role_id
AND r.del_flag = 1
WHERE
a.del_flag = 1
@@ -346,8 +350,8 @@
select
sum(case when us.shipper_fill = 2 then 1 end)
+
sum(case when us.shipper_enterprise_fill = 2 then 1 end) as `count`
from user u
sum(case when us.shipper_enterprise_fill = 2 then 1 end) as count
from "USER" u
left join user_shipper us on u.user_id = us.user_id
<where>
u.del_flag = 1
@@ -378,11 +382,4 @@
and esign_enterprise_status = #{userShipperEntity.esignEnterpriseStatus}
</select>
<select id="getShipperSummaryData" parameterType="java.lang.Long"
resultType="com.mhd.common.core.domain.po.UserShipperPo">
<include refid="selectShipperVo1"/>
and b.user_id = #{value}
group by b.user_id
</select>
</mapper>