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-modules/mhd-system/pom.xml
+6 -1
View File
@@ -54,9 +54,14 @@
</dependency>
<!-- Mysql Connector -->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.1.193</version>
</dependency>
<!-- Mhd Common DataSource -->
mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCityMapper.xml
+3 -3
View File
@@ -17,7 +17,7 @@
a.update_by,
a.update_by_name,
a.del_flag
FROM `sys_city` a
FROM sys_city a
WHERE a.del_flag = 1
</sql>
@@ -43,7 +43,7 @@
a.update_by,
a.update_by_name,
a.del_flag
FROM `sys_city` a
FROM sys_city a
WHERE a.del_flag = 1
<include refid="common_where"></include>
</select>
@@ -71,7 +71,7 @@
city_name,
city_remark
FROM
`sys_city`
sys_city
WHERE
province_code = #{values}
ORDER BY
mhd-modules/mhd-system/src/main/resources/mapper/basic/SysCountyMapper.xml
+4 -4
View File
@@ -17,7 +17,7 @@
a.update_by,
a.update_by_name,
a.del_flag
FROM `sys_county` a
FROM sys_county a
WHERE a.del_flag = 1
</sql>
@@ -43,7 +43,7 @@
a.update_by_name,
a.del_flag
FROM
`sys_county` a
sys_county a
WHERE
a.del_flag = 1
<include refid="common_where"></include>
@@ -68,7 +68,7 @@
city_code,
county_name,
county_remark
FROM `sys_county`
FROM sys_county
WHERE city_code = #{values}
ORDER BY county_code_new DESC LIMIT 1
</select>
@@ -113,7 +113,7 @@
a.county_name as countyName,
CONCAT( c.province_name, b.city_name, a.county_name ) AS provinceCityCountyName
FROM
`sys_county` a
sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
WHERE
mhd-modules/mhd-system/src/main/resources/mapper/basic/SysProvinceMapper.xml
+11 -11
View File
@@ -15,7 +15,7 @@
a.update_by,
a.update_by_name,
a.del_flag
FROM `sys_province` a
FROM sys_province a
WHERE a.del_flag = 1
</sql>
@@ -41,7 +41,7 @@
a.update_by,
a.update_by_name,
a.del_flag
FROM `sys_province` a
FROM sys_province a
WHERE a.del_flag = 1
<include refid="common_where"></include>
</select>
@@ -62,7 +62,7 @@
SELECT a.* FROM
(SELECT
c.province_id as areaId,
"" as parentAreaCode,
'' as parentAreaCode,
c.province_code AS areaCode,
c.province_code AS areaCodeNew,
c.province_name AS areaName,
@@ -75,7 +75,7 @@
c.update_by_name,
c.del_flag
FROM
`sys_county` a
sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
UNION
@@ -94,7 +94,7 @@
b.update_by_name,
b.del_flag
FROM
`sys_county` a
sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
UNION
@@ -113,7 +113,7 @@
a.update_by_name,
a.del_flag
FROM
`sys_county` a
sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
) a
@@ -134,7 +134,7 @@
resultType="com.mhd.basic.domain.areaAggregate.repository.po.SysAreaPO">
SELECT
c.province_id as areaId,
"" as parentAreaCode,
'' as parentAreaCode,
c.province_code AS areaCode,
c.province_code AS areaCodeNew,
c.province_name AS areaName,
@@ -147,7 +147,7 @@
c.update_by_name,
c.del_flag
FROM
`sys_county` a
sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
@@ -178,7 +178,7 @@
b.update_by_name,
b.del_flag
FROM
`sys_county` a
sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
WHERE
@@ -208,7 +208,7 @@
a.update_by_name,
a.del_flag
FROM
`sys_county` a
sys_county a
LEFT JOIN sys_city b ON a.city_code = b.city_code
LEFT JOIN sys_province c ON b.province_code = c.province_code
WHERE
@@ -245,7 +245,7 @@
province_name,
province_remark
FROM
`sys_province`
sys_province
ORDER BY
province_code DESC
LIMIT 1
mhd-modules/mhd-system/src/main/resources/mapper/basic/UserFormConfigInterface.xml
+1 -1
View File
@@ -7,7 +7,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
a.*
FROM
`basic_agreement` a
basic_agreement a
WHERE
a.del_flag = 1
</sql>
mhd-modules/mhd-system/src/main/resources/mapper/basic/addressBook/UserFormConfigInterface.xml
+2 -2
View File
@@ -118,7 +118,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
ab1.latitude AS receive_doorplate,
ab1.address_plot AS receive_addressPlot
FROM
`common_route` cr
common_route cr
LEFT JOIN
address_book ab
ON ab.address_book_id = cr.send_address_id and ab.user_id = #{userId}
@@ -180,7 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.doorplate,
b.remark
FROM
`manifest_throught` m
manifest_throught m
LEFT JOIN
address_book b
ON m.address_book_id = b.address_book_id
mhd-modules/mhd-system/src/main/resources/mapper/basic/materialBaseInfo/MaterialBaseInfoMapper.xml
+1 -1
View File
@@ -170,7 +170,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
and material_base_info_id in (SELECT
DISTINCT material_base_info_id
FROM `test_szwl_wms`.material_inventory
FROM test_szwl_wms.material_inventory
WHERE
allocation_quantity > 0
AND del_flag = 1)
mhd-modules/mhd-system/src/main/resources/mapper/basic/materialClassify/MaterialClassifyMapper.xml
+4 -4
View File
@@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<sql id="selectMaterialClassifyPo">
select material_classify_id, organization_id, organization_name, top_organization_id, code, `name`, `level`, parent_code, parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from material_classify
select material_classify_id, organization_id, organization_name, top_organization_id, code, name, level, parent_code, parent_name, code_path, name_path, remark, nullify, create_time, create_by, create_by_name, update_time, update_by, update_by_name, del_flag from material_classify
</sql>
<sql id="selectMaterialClassifyPo1">
@@ -47,10 +47,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and code = #{code}
</if>
<if test="name != null and name != ''">
and `name` like concat('%', #{name}, '%')
and name like concat('%', #{name}, '%')
</if>
<if test="level != null ">
and `level` = #{level}
and level = #{level}
</if>
<if test="parentCode != null and parentCode != ''">
and parent_code = #{parentCode}
@@ -93,6 +93,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<include refid="selectMaterialClassifyPo"/>
WHERE
FIND_IN_SET(#{parentCode}, code_path) > 0
ORDER BY `level` ASC
ORDER BY level ASC
</select>
</mapper>
mhd-modules/mhd-system/src/main/resources/mapper/basic/storageLocationGroup/StorageLocationGroupMapper.xml
+1 -1
View File
@@ -82,7 +82,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and update_by_name like concat('%', #{updateByName}, '%')
</if>
<if test="number != null">
and `number` = #{number}
and number = #{number}
</if>
<if test="remark != null and remark != ''">
and remark like concat('%',#{remark},'%')
mhd-modules/mhd-system/src/main/resources/mapper/system/SysMenuMapper.xml
+6 -6
View File
@@ -29,7 +29,7 @@
</resultMap>
<sql id="selectMenuVo">
select menu_id, menu_name, parent_id, order_num, path, component, `query`, is_frame, is_cache, menu_type, visible,sys_type, status, ifnull(perms,'') as perms, icon, create_time
select menu_id, menu_name, parent_id, order_num, path, component, query, is_frame, is_cache, menu_type, visible,sys_type, status, ifnull(perms,'') as perms, icon, create_time
from sys_menu
</sql>
@@ -54,13 +54,13 @@
</select>
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m where m.menu_type in ('M', 'C') and m.status = 0
order by m.parent_id, m.order_num
</select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type,m.sys_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type,m.sys_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
@@ -82,7 +82,7 @@
</select>
<select id="selectMenuTreeByUserId" parameterType="Long" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status, ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
left join sys_user_role ur on rm.role_id = ur.role_id
@@ -151,7 +151,7 @@
<if test="orderNum != null">order_num = #{orderNum},</if>
<if test="path != null and path != ''">path = #{path},</if>
<if test="component != null">component = #{component},</if>
<if test="query != null">`query` = #{query},</if>
<if test="query != null">query = #{query},</if>
<if test="isFrame != null and isFrame != ''">is_frame = #{isFrame},</if>
<if test="isCache != null and isCache != ''">is_cache = #{isCache},</if>
<if test="menuType != null and menuType != ''">menu_type = #{menuType},</if>
@@ -174,7 +174,7 @@
<if test="orderNum != null">order_num,</if>
<if test="path != null and path != ''">path,</if>
<if test="component != null and component != ''">component,</if>
<if test="query != null and query != ''">`query`,</if>
<if test="query != null and query != ''">query,</if>
<if test="isFrame != null and isFrame != ''">is_frame,</if>
<if test="isCache != null and isCache != ''">is_cache,</if>
<if test="menuType != null and menuType != ''">menu_type,</if>
mhd-modules/mhd-system/src/main/resources/mapper/system/SysTenantManagementMapper.xml
+1 -1
View File
@@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
a.accounting_id,
a.charge_amount,
a.tenant_phone,
a.`status`,
a.status,
a.del_flag,
a.create_by,
a.create_time,
mhd-user-center/pom.xml
+6 -1
View File
@@ -93,9 +93,14 @@
<!-- <version>5.1.47</version>&lt;!&ndash;依据自己本地数据库的版本进行跳转 &ndash;&gt;-->
<!-- </dependency>-->
<!-- Mysql Connector -->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.1.193</version>
</dependency>
<!--import mybatis plus 它会自动引入mybatis及mybatis spring切勿重复引用以免冲突-->
<dependency>
mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeMapper.java
+1 -1
View File
@@ -56,6 +56,6 @@ public interface MotorcadeMapper extends BaseMapper<Motorcade>
List<UserDriverPo> fleetInviteDriverList(@Param("motorcadeDriverDO") MotorcadeDriverDO motorcadeDriverDO);
@Select("SELECT m.* FROM `motorcade_driver` md LEFT JOIN motorcade m ON md.motorcade_id = m.motorcade_id WHERE md.del_flag = 1 AND m.del_flag = 1 AND md.user_id = #{userId} AND m.motorcade_header_id != #{userId}")
@Select("SELECT m.* FROM motorcade_driver md LEFT JOIN motorcade m ON md.motorcade_id = m.motorcade_id WHERE md.del_flag = 1 AND m.del_flag = 1 AND md.user_id = #{userId} AND m.motorcade_header_id != #{userId}")
List<MotorcadePo> getAllOtherMotorcade(@Param("userId") Long userId);
}
mhd-user-center/src/main/java/com/mhd/user/domain/motorcade/repository/mapper/MotorcadeRecordMapper.java
+1 -1
View File
@@ -37,6 +37,6 @@ public interface MotorcadeRecordMapper extends BaseMapper<MotorcadeRecord>
*/
List<MotorcadeRecordPo> invitationRecordListPC(@Param("motorcadeRecordDo")MotorcadeRecordDO motorcadeRecordDo);
@Select("SELECT * FROM `motorcade_record` WHERE del_flag = 1 AND motorcade_id IN (SELECT motorcade_id FROM motorcade WHERE del_flag = 1 and motorcade_header_id = #{userId})")
@Select("SELECT * FROM motorcade_record WHERE del_flag = 1 AND motorcade_id IN (SELECT motorcade_id FROM motorcade WHERE del_flag = 1 and motorcade_header_id = #{userId})")
List<MotorcadeRecord> getByMotorHeaderId(@Param("userId") Long userId);
}
mhd-user-center/src/main/java/com/mhd/user/domain/roleAggregate/repository/mapper/CustomAuthUserMapper.java
+1 -1
View File
@@ -12,7 +12,7 @@ import java.util.List;
public interface CustomAuthUserMapper extends BaseMapper<CustomAuthUserEntity> {
List<CustomAuthRoleOrUserPO> getCustomAuthByRoleOrUserId(CustomAuthDO customAuthDO);
@Select("SELECT * FROM `custom_auth_role` WHERE role_id IN (SELECT role_id FROM user_role WHERE user_id = #{userId})")
@Select("SELECT * FROM custom_auth_role WHERE role_id IN (SELECT role_id FROM user_role WHERE user_id = #{userId})")
List<CustomAuthRoleOrUserPO> getCustomAuthByRole(@Param("userId") Long userId);
void deleteCustomAuthUserByUserId(CustomAuthDO customAuthDO);
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserEntity.java
+1 -1
View File
@@ -14,7 +14,7 @@ import java.util.Date;
@EqualsAndHashCode(callSuper = true)
@Data
@TableName("user")
@TableName("\"USER\"")
public class UserEntity extends BaseVOEntity {
@ApiModelProperty(name = "用户ID")
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/DriverVehicleBindMapper.java
+1 -1
View File
@@ -37,6 +37,6 @@ public interface DriverVehicleBindMapper extends BaseMapper<DriverVehicleBind>
*/
List<VehicleDriverBindAppPo> queryVehicleBindInfo(@Param("driverVehicleBindDo") DriverVehicleBindDo driverVehicleBindDo);
@Select("SELECT count(driver_vehicle_bind_id) FROM `driver_vehicle_bind` WHERE (user_id = #{userId} OR driver_bind_id = #{userId}) AND del_flag = 1 ")
@Select("SELECT count(driver_vehicle_bind_id) FROM driver_vehicle_bind WHERE (user_id = #{userId} OR driver_bind_id = #{userId}) AND del_flag = 1 ")
Integer selectByUserId(@Param("userId") Long userId);
}
mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserMapper.java
+2 -2
View File
@@ -51,7 +51,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
List<UserDriverEnterprisePo> getAllDriverByOrganization(@Param("topOrganizationId") Long topOrganizationId);
@Select("SELECT COUNT(*) FROM `user` WHERE del_flag = 1 AND create_by = #{userId} AND user_id != #{userId}")
@Select("SELECT COUNT(*) FROM \"USER\" WHERE del_flag = 1 AND create_by = #{userId} AND user_id != #{userId}")
Integer selectCreatByUserId(@Param("userId") Long userId);
@@ -64,7 +64,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
*/
List<UserAppPo> selectAppUserListByRoleCode(UserDO userDO);
@Select("SELECT * FROM `user` WHERE del_flag = 1 AND organization_id = #{organizationId} AND user_account_type = 3 limit 1")
@Select("SELECT * FROM \"USER\" WHERE del_flag = 1 AND organization_id = #{organizationId} AND user_account_type = 3 limit 1")
UserEntity selectByTopOrganizationId(@Param("organizationId") Long organizationId);
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>
mhd_finance/pom.xml
+6 -1
View File
@@ -73,9 +73,14 @@
<groupId>com.mhd</groupId>
<artifactId>mhd-common-redis</artifactId>
</dependency>
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.1.193</version>
</dependency>
<!--添加druid连接池 依赖 -->
<dependency>
mhd_finance/src/main/resources/mapper/accountManage/AccountCashWalletMapper.xml
+2 -2
View File
@@ -12,9 +12,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</sql>
<!--<update id="updateCreditLimit">
UPDATE `account_cash_wallet` SET `credit_limit` =
UPDATE account_cash_wallet SET credit_limit =
CASE
WHEN `credit_limit` - #{creditLimit} >= 0 THEN `credit_limit` - #{creditLimit}
WHEN credit_limit - #{creditLimit} >= 0 THEN credit_limit - #{creditLimit}
ELSE credit_limit
END
WHERE user_id = #{userId}
mhd_finance/src/main/resources/mapper/businessDocument/BusinessDocumentMapper.xml
+2 -2
View File
@@ -148,7 +148,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
COUNT( 1 ) waybillCount,
waybill_source_name
FROM
`business_document`
business_document
where del_flag = 1
<include refid="selectBusinessDocumentPo1"/>
GROUP BY
@@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
a.*
FROM
`business_document` a
business_document a
LEFT JOIN reconciliation_business_document c ON a.business_document_id = c.business_document_id
LEFT JOIN reconciliation d ON c.reconciliation_id = d.reconciliation_id
WHERE
mhd_finance/src/main/resources/mapper/businessDocumentDetali/BusinessDocumentDetaliMapper.xml
+1 -1
View File
@@ -252,7 +252,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
a.*
FROM
`business_document_detali` a
business_document_detali a
LEFT JOIN reconciliation_business_document c ON a.business_document_id = c.business_document_id
LEFT JOIN reconciliation d ON c.reconciliation_id = d.reconciliation_id
WHERE
mhd_finance/src/main/resources/mapper/loanManage/LoanManageMapper.xml
+1 -1
View File
@@ -506,7 +506,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
image_url
FROM
`loan_image`
loan_image
WHERE
loan_id = #{values} and del_flag = 1
</select>
mhd_product/pom.xml
+6 -1
View File
@@ -74,9 +74,14 @@
<artifactId>mhd-common-redis</artifactId>
</dependency>
<!-- Mysql Connector -->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.1.193</version>
</dependency>
<!--添加druid连接池 依赖 -->
<dependency>
mhd_product/src/main/java/com/linke/product/domain/menu/repository/mapper/MenuMapper.java
+1 -1
View File
@@ -152,6 +152,6 @@ public interface MenuMapper extends BaseMapper<Menu> {
List<Menu> selectListByProductIdList(@Param("list") List<Long> list);
@Select("SELECT * FROM `custom_auth` WHERE menu_id in (SELECT menu_id FROM sys_menu WHERE top_organization_id = #{organizationId})")
@Select("SELECT * FROM custom_auth WHERE menu_id in (SELECT menu_id FROM sys_menu WHERE top_organization_id = #{organizationId})")
List<CustomAuth> getCustomAuthByOrganizationId(@Param("organizationId") Long organizationId);
}
mhd_product/src/main/resources/mapper/appMenu/AppMenuMapper.xml
+3 -3
View File
@@ -52,7 +52,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select
a.app_menu_id, a.app_id, me.modules_id
from app_menu a
left join `sys_menu` me ON me.menu_id = a.menu_id
left join sys_menu me ON me.menu_id = a.menu_id
where
a.del_Flag = 1
and me.del_Flag = 1
@@ -91,8 +91,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
me.menu_show,
me.menu_perms
from app_menu a
left join `app_config` co ON co.app_id = a.app_id
left join `sys_menu` me ON me.menu_id = a.menu_id
left join app_config co ON co.app_id = a.app_id
left join sys_menu me ON me.menu_id = a.menu_id
where
a.del_flag = 1
and me.del_flag = 1
mhd_product/src/main/resources/mapper/appUserMenuSettings/AppUserMenuSettingsMapper.xml
+1 -1
View File
@@ -81,7 +81,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
me.menu_show,
me.menu_perms
from app_user_menu_settings a
left join `sys_menu` me ON me.menu_id = a.menu_id
left join sys_menu me ON me.menu_id = a.menu_id
where
a.del_flag = 1
and me.del_flag = 1
mhd_product/src/main/resources/mapper/customAuth/CustomAuthOrganizationMapper.xml
+1 -1
View File
@@ -31,7 +31,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
`custom_auth_organization`
custom_auth_organization
</sql>
<select id="selectCustomAuthByOrganization" parameterType="com.linke.product.domain.customAuth.entity.CustomAuthOrganization" resultMap="CustomAuthOrganizationResult">
mhd_product/src/main/resources/mapper/menu/MenuMapper.xml
+11 -11
View File
@@ -76,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
me.top_organization_id,
me.home_show_flag
FROM
`sys_menu` me
sys_menu me
LEFT JOIN
sys_modules mo
ON me.modules_id = mo.modules_id
@@ -168,7 +168,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
me.menu_remark,
me.menu_perms
FROM
`sys_menu` me
sys_menu me
LEFT JOIN
sys_modules mo
ON me.modules_id = mo.modules_id
@@ -231,7 +231,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
sys_tenants t
LEFT JOIN
`tenants_menu` tm
tenants_menu tm
ON t.tenants_id = tm.tenants_id
INNER JOIN
sys_menu m
@@ -258,7 +258,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
om.organization_id,
m.modules_id
FROM
`organization_menu` om
organization_menu om
LEFT JOIN
sys_menu m
ON om.menu_id = m.menu_id
@@ -276,12 +276,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
menu_component AS menuComponent,
menu_redirect_path AS menuRedirectPath
FROM
`sys_menu`
sys_menu
where
del_flag = 1
and menu_show = 1
AND menu_component IS NOT NULL
AND menu_component != ""
AND menu_component != ''
</select>
<select id="selectMenuById" parameterType="java.lang.Long" resultMap="MenuResult">
@@ -303,7 +303,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
DISTINCT modules_id
FROM
`sys_menu`
sys_menu
WHERE
del_flag = 1
AND menu_id in
@@ -317,9 +317,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
m.menu_id
FROM
`sys_menu` m
sys_menu m
LEFT JOIN
`sys_menu` mp
sys_menu mp
ON m.parent_menu_id = mp.menu_id
LEFT JOIN
sys_modules mo
@@ -341,7 +341,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
menu_id
FROM
`sys_menu`
sys_menu
WHERE
del_flag = 1
and menu_show = 1
@@ -352,7 +352,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
DISTINCT parent_menu_id
FROM
`sys_menu`
sys_menu
WHERE
parent_menu_id != 0
AND menu_id in
mhd_product/src/main/resources/mapper/modules/ModulesMenuMapper.xml
+1 -1
View File
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
`modules_menu`
modules_menu
</sql>
<select id="selectMenuListByModulesId" parameterType="java.lang.Long" resultMap="ModulesMenuResult">
mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml
+66 -43
View File
@@ -96,9 +96,9 @@
o1.interbank_number,
o1.template_seal
FROM
`sys_organization` o1
sys_organization o1
LEFT JOIN
`sys_organization` o2
sys_organization o2
ON o1.parent_organization_id = o2.organization_id
</sql>
@@ -120,7 +120,7 @@
</foreach>
</if>
<if test=" isCorrelation != null and isCorrelation == 1 and organizationId != null ">
AND o1.organization_id NOT IN ( SELECT organization_id FROM `sys_organization_correlation` WHERE organization_id = #{organizationId} )
AND o1.organization_id NOT IN ( SELECT organization_id FROM sys_organization_correlation WHERE organization_id = #{organizationId} )
</if>
order by o1.create_time desc
</select>
@@ -134,7 +134,7 @@
SELECT
organization_id
FROM
`sys_organization`
sys_organization
where tenants_id = #{value} and del_flag = 1
and organization_state = 1
</select>
@@ -148,9 +148,9 @@
b.tenants_simple_name,
b.user_id
FROM
`sys_organization` a
LEFT JOIN `sys_tenants` b ON a.tenants_id = b.tenants_id AND b.del_flag = 1
LEFT JOIN `tenants_domain_name` c ON b.tenants_id = c.tenants_id AND c.del_flag = 1
sys_organization a
LEFT JOIN sys_tenants b ON a.tenants_id = b.tenants_id AND b.del_flag = 1
LEFT JOIN tenants_domain_name c ON b.tenants_id = c.tenants_id AND c.del_flag = 1
WHERE
a.del_flag = 1
AND (b.tenants_domain_name = #{value}
@@ -216,7 +216,7 @@
SELECT
organization_id
FROM
`sys_organization`
sys_organization
where
del_flag = 1
</select>
@@ -225,7 +225,7 @@
SELECT
organization_id
FROM
`sys_organization`
sys_organization
where
del_flag = 1
AND parent_organization_id in
@@ -234,43 +234,66 @@
</foreach>
</select>
<select id="selectChildByOrganization" resultType="java.lang.Long">
select organization_id from (
select
t1.organization_id,
if(find_in_set(parent_organization_id, @pids) > 0, @pids := concat(@pids, ',', organization_id), 0) as ischild
from (
select
organization_id,
parent_organization_id
from sys_organization t order by parent_organization_id, organization_id
) t1,
(select @pids := #{id}) t2
) t3 where ischild != 0 OR organization_id = #{id}
order by organization_id
<!--达梦适配修改-->
<!--select organization_id from (-->
<!-- select-->
<!-- t1.organization_id,-->
<!-- if(find_in_set(parent_organization_id, @pids) > 0, @pids := concat(@pids, ',', organization_id), 0) as ischild-->
<!-- from (-->
<!-- select-->
<!-- organization_id,-->
<!-- parent_organization_id-->
<!-- from sys_organization t order by parent_organization_id, organization_id-->
<!-- ) t1,-->
<!-- (select @pids := #{id}) t2-->
<!--) t3 where ischild != 0 OR organization_id = #{id}-->
<!--order by organization_id-->
SELECT organization_id
FROM sys_organization
WHERE organization_id = #{id}
UNION
SELECT organization_id
FROM sys_organization
START WITH organization_id = #{id}
CONNECT BY PRIOR organization_id = parent_organization_id
ORDER BY organization_id;
</select>
<select id="selectAllOrganizationById" resultType="java.lang.Long" parameterType="java.lang.Long">
SELECT
organization_id
FROM
(
SELECT
t1.organization_id,
t1.organization_name,
t1.parent_organization_id,
IF
(
find_in_set( parent_organization_id, @pids ) > 0,
@pids := concat( @pids, ',', organization_id ),
IF
( t1.organization_id = #{organizationId}, #{organizationId}, - 1 )
) AS ischild
FROM
( SELECT organization_id, parent_organization_id, organization_name FROM sys_organization t ) t1,
( SELECT @pids := #{organizationId} ) t2
) t3
WHERE
ischild != - 1
<!-- SELECT-->
<!-- organization_id-->
<!-- FROM-->
<!-- (-->
<!-- SELECT-->
<!-- t1.organization_id,-->
<!-- t1.organization_name,-->
<!-- t1.parent_organization_id,-->
<!-- IF-->
<!-- (-->
<!-- find_in_set( parent_organization_id, @pids ) > 0,-->
<!-- @pids := concat( @pids, ',', organization_id ),-->
<!-- IF-->
<!-- ( t1.organization_id = #{organizationId}, #{organizationId}, - 1 )-->
<!-- ) AS ischild-->
<!-- FROM-->
<!-- ( SELECT organization_id, parent_organization_id, organization_name FROM sys_organization t ) t1,-->
<!-- ( SELECT @pids := #{organizationId} ) t2-->
<!-- ) t3-->
<!--WHERE-->
<!--ischild != - 1-->
WITH RECURSIVE org_tree(org_id) AS (
-- 初始查询：找到指定组织
SELECT organization_id
FROM sys_organization
WHERE organization_id = #{organizationId}
UNION ALL
-- 递归查询：找到所有子组织
SELECT child.organization_id
FROM sys_organization child
INNER JOIN org_tree parent
ON child.parent_organization_id = parent.org_id
)
SELECT org_id AS organization_id FROM org_tree;
</select>
<select id="getAllOrganization"
resultType="com.linke.product.domain.organization.repository.po.OrganizationPo">
mhd_product/src/main/resources/mapper/organization/OrganizationMenuMapper.xml
+1 -1
View File
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
`organization_menu`
organization_menu
</sql>
<select id="selectMenuListByOrganizationId" parameterType="java.lang.Long" resultMap="OrganizationMenuResult">
mhd_product/src/main/resources/mapper/product/ProductDetailsMapper.xml
+1 -1
View File
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
spd.update_by,
spd.del_flag
FROM
`sys_product_details` spd
sys_product_details spd
LEFT JOIN sys_modules sm ON spd.modules_id = sm.modules_id
AND sm.del_flag = 1
</sql>
mhd_product/src/main/resources/mapper/product/ProductMenuMapper.xml
+1 -1
View File
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
`product_menu`
product_menu
</sql>
<select id="selectMenuListByProductId" parameterType="java.lang.Long" resultMap="ProductMenuResult">
mhd_product/src/main/resources/mapper/product/SysProductMapper.xml
+7 -7
View File
@@ -52,8 +52,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN
(SELECT
p.product_id,
GROUP_CONCAT(m.modules_name) as modules_names,
GROUP_CONCAT(m.modules_id) as modules_ids
WM_CONCAT(m.modules_name) as modules_names,
WM_CONCAT(m.modules_id) as modules_ids
FROM
sys_product p
LEFT JOIN
@@ -68,8 +68,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN (
SELECT
p.product_id AS app_product_id,
GROUP_CONCAT( m.modules_name ) AS app_modules_names,
GROUP_CONCAT( m.modules_id ) AS app_modules_ids
WM_CONCAT( m.modules_name ) AS app_modules_names,
WM_CONCAT( m.modules_id ) AS app_modules_ids
FROM
sys_product p
LEFT JOIN sys_product_details d ON p.product_id = d.product_id
@@ -127,7 +127,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
DISTINCT m.menu_id
FROM
`sys_product` p
sys_product p
LEFT JOIN
sys_product_details d
ON p.product_id = d.product_id
@@ -223,7 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
p.product_home_name,
p.route_status
FROM
`sys_product` p
sys_product p
LEFT JOIN tenants_product tp ON tp.product_id = p.product_id
LEFT JOIN sys_organization o ON o.tenants_id = tp.tenants_id
WHERE
@@ -234,7 +234,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
a.product_id
FROM
`sys_product` a
sys_product a
LEFT JOIN sys_product_details b ON a.product_id = b.product_id
AND b.del_flag = 1
LEFT JOIN sys_menu c ON b.modules_id = c.modules_id
mhd_product/src/main/resources/mapper/tenants/SysTenantsMapper.xml
+6 -6
View File
@@ -60,12 +60,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM
sys_tenants t
LEFT JOIN
`sys_organization` o
sys_organization o
ON t.tenants_id = o.tenants_id AND o.parent_organization_id = 0
LEFT JOIN
(SELECT
t.tenants_id,
GROUP_CONCAT(p.product_name) as product_name
WM_CONCAT(p.product_name) as product_name
FROM
sys_tenants t
LEFT JOIN
@@ -99,7 +99,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
SELECT
p.product_id
FROM
`sys_tenants` t
sys_tenants t
LEFT JOIN
sys_organization o
ON t.tenants_id = o.tenants_id
@@ -113,7 +113,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
o.organization_id = #{values} and t.del_flag = 1 and po.product_status = 1
</select>
<select id="selectByDomainName" resultType="com.linke.product.domain.tenants.entity.SysTenants">
SELECT * FROM `sys_tenants`
SELECT * FROM sys_tenants
where del_flag = 1
and tenants_domain_name = #{tenantsDomainName}
<if test="tenantsId != null and tenantsId != ''">
@@ -126,7 +126,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
b.*,
c.organization_id
FROM
`tenants_domain_name` a
tenants_domain_name a
LEFT JOIN sys_tenants b ON a.tenants_id = b.tenants_id
LEFT JOIN sys_organization c ON b.tenants_id = c.tenants_id and c.organization_state =1
WHERE
@@ -187,7 +187,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</update>
<delete id="deleteSysTenantsByTenantsId" parameterType="java.lang.Long">
UPDATE `sys_tenants` SET `del_flag` = 2 WHERE `tenants_id` = #{tenantsId}
UPDATE sys_tenants SET del_flag = 2 WHERE tenants_id = #{tenantsId}
</delete>
<delete id="deleteSysTenantsByTenantsIds" parameterType="java.lang.String">
mhd_product/src/main/resources/mapper/tenants/TenantsMenuMapper.xml
+1 -1
View File
@@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
update_by,
del_flag
FROM
`tenants_menu`
tenants_menu
</sql>
<select id="selectMenuListByTenantsId" parameterType="java.lang.Long" resultMap="TenantsMenuResult">
mhd_product/src/main/resources/mapper/tenants/TenantsProductMapper.xml
+1 -1
View File
@@ -32,7 +32,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
p.product_icon,
p.product_photo
FROM
`tenants_product` p
tenants_product p
LEFT JOIN
sys_product po
ON po.product_id = p.product_id
mhd_thrid_party/pom.xml
+6 -1
View File
@@ -80,9 +80,14 @@
<artifactId>seata-spring-boot-starter</artifactId>
</dependency>
<!-- Mysql Connector -->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.1.193</version>
</dependency>
<!--添加druid连接池 依赖 -->
<dependency>
mhd_transport/pom.xml
+6 -1
View File
@@ -74,9 +74,14 @@
<artifactId>mhd-common-redis</artifactId>
</dependency>
<!-- Mysql Connector -->
<dependency>
<!--<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
</dependency>-->
<dependency>
<groupId>com.dameng</groupId>
<artifactId>DmJdbcDriver18</artifactId>
<version>8.1.1.193</version>
</dependency>
<!--添加druid连接池 依赖 -->
<dependency>
mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/CreateMaterialCommand.java
+2
View File
@@ -1,5 +1,6 @@
package com.linke.transport.application.service.warehouse.material.command;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
@@ -25,6 +26,7 @@ public class CreateMaterialCommand {
private String name;
@ApiModelProperty(value = "物料型号")
@TableField("\"MODEL\"") // 字段名转义
private String model;
@NotBlank(message = "物料单位不能为空")
mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/command/UpdateMaterialCommand.java
+2
View File
@@ -1,5 +1,6 @@
package com.linke.transport.application.service.warehouse.material.command;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
@@ -24,6 +25,7 @@ public class UpdateMaterialCommand {
@ApiModelProperty(value = "物料名称")
private String name;
@ApiModelProperty(value = "物料型号")
@TableField("\"MODEL\"") // 字段名转义
private String model;
@ApiModelProperty(value = "物料单位")
private String unit;
mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/query/MaterialQueryCommand.java
+2
View File
@@ -1,5 +1,6 @@
package com.linke.transport.application.service.warehouse.material.query;
import com.baomidou.mybatisplus.annotation.TableField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,6 +17,7 @@ public class MaterialQueryCommand {
@ApiModelProperty(name = "名称")
private String name;
@ApiModelProperty(name = "型号")
@TableField("\"MODEL\"") // 字段名转义
private String model;
@ApiModelProperty("物料编码")
private String materialCode;
mhd_transport/src/main/java/com/linke/transport/application/service/warehouse/material/vo/MaterialVO.java
+2
View File
@@ -1,5 +1,6 @@
package com.linke.transport.application.service.warehouse.material.vo;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import java.math.BigDecimal;
@@ -24,6 +25,7 @@ public class MaterialVO{
@ApiModelProperty("名称")
private String name;
@ApiModelProperty("型号")
@TableField("\"MODEL\"") // 字段名转义
private String model;
@ApiModelProperty("单位")
private String unit;
mhd_transport/src/main/java/com/linke/transport/domain/warehouse/material/model/Material.java
+3
View File
@@ -1,5 +1,6 @@
package com.linke.transport.domain.warehouse.material.model;
import com.baomidou.mybatisplus.annotation.TableField;
import com.linke.transport.domain.warehouse.material.MaterialCodeGenerator;
import com.linke.transport.domain.warehouse.material.exception.MaterialDomainException;
import com.mhd.common.core.utils.StringUtils;
@@ -20,8 +21,10 @@ public class Material {
private Long ownerId;
private String category;
private String name;
@TableField("\"MODEL\"") // 字段名转义
private String model;
private String unit;
@TableField("\"VALUE\"") // 字段名转义
private BigDecimal value;
private boolean codeManaged;
private String remark;
mhd_transport/src/main/java/com/linke/transport/infrastructure/warehouse/material/persistence/MaterialDO.java
+1
View File
@@ -21,6 +21,7 @@ public class MaterialDO {
private Long ownerId;
private String category;
private String name;
@TableField("\"MODEL\"") // 字段名转义
private String model;
private String unit;
private BigDecimal value;
mhd_transport/src/main/resources/mapper/inventory/InventoryMapper.xml
+3 -3
View File
@@ -33,12 +33,12 @@
i.material_id,
m.category AS material_category,
m.name AS material_name,
m.model AS material_model,
m."MODEL" AS material_model,
i.quantity,
m.unit,
m.weight,
m.code_managed,
m.value,
m."VALUE",
i.machine_serial_no,
i.created_at
FROM
@@ -91,7 +91,7 @@
i.material_id,
m.category AS material_category,
m.name AS material_name,
m.model AS material_model,
m."MODEL" AS material_model,
i.quantity,
m.unit,
m.weight,