From d8ba960d180c0ad08b7dfb5a17e7ad351ca2eb62 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 30 十月 2024 11:00:36 +0800
Subject: [PATCH] 报告转pdf格式错误异常解决
---
user-server/src/main/resources/mapper/UserMapper.xml | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/user-server/src/main/resources/mapper/UserMapper.xml b/user-server/src/main/resources/mapper/UserMapper.xml
index 5c58eb1..d2da4a7 100644
--- a/user-server/src/main/resources/mapper/UserMapper.xml
+++ b/user-server/src/main/resources/mapper/UserMapper.xml
@@ -3,17 +3,52 @@
<mapper namespace="com.yuanchu.mom.mapper.UserMapper">
<select id="selectUserDtoPageList" resultType="com.yuanchu.mom.dto.UserPageDto">
select * from (
- select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user, u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name create_user_name, u3.name update_user_name, r.name role_name
- from user u1
- left join user u2 on u2.id = u1.create_user
- left join user u3 on u3.id = u1.update_user
- left join role r on u1.role_id = r.id
+ select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user,
+ u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name
+ create_user_name, u3.name update_user_name, r.name role_name,u1.signature_url,u1.picture_url,u1.depart_id,
+ u1.name_en,u1.depart_lims_id
+ from user u1
+ left join user u2 on u2.id = u1.create_user
+ left join user u3 on u3.id = u1.update_user
+ left join role r on u1.role_id = r.id
) a
<if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
${ew.customSqlSegment}
</if>
</select>
+
+ <select id="selectPersonnelOverview" resultType="com.yuanchu.mom.dto.UserPageDto">
+ select * from (
+ select u1.id, u1.account, u1.name, u1.state, u1.create_time, u1.update_time, u1.create_user, u1.update_user,
+ u1.age, u1.email, u1.phone, u1.department, u1.company, u1.address, u1.is_custom, u1.role_id, u2.name
+ create_user_name, u3.name update_user_name, r.name role_name,u1.signature_url,u1.picture_url,u1.depart_id,
+ u1.name_en
+ from user u1
+ left join user u2 on u2.id = u1.create_user
+ left join user u3 on u3.id = u1.update_user
+ left join role r on u1.role_id = r.id
+ where u1.depart_lims_id is not null
+ ) a
+ <if test="ew.customSqlSegment != null and ew.customSqlSegment != ''">
+ ${ew.customSqlSegment}
+ </if>
+ </select>
+
<select id="getDeviceManager" resultType="com.yuanchu.mom.dto.UserPageDto">
- select id,name from user where state=1
+ select id, name
+ from user
+ where state = 1
+ </select>
+ <select id="getCustom" resultType="com.yuanchu.mom.pojo.User">
+ select u.id,c.company,u.name,c.code,u.phone,c.id departId from user u
+ left join custom c on u.company = c.id
+ where u.id = #{userId}
+ </select>
+ <select id="getUser" resultType="com.yuanchu.mom.pojo.User">
+ select * from user where state = 1
+ </select>
+ <select id="selectDepartLims" resultType="java.lang.String">
+ select name from department_lims
+ where id= (select SUBSTRING_INDEX(SUBSTRING_INDEX(depart_lims_id, ',', -2), ',', 1) AS depart_lims_id from user where name=#{prepareUser})
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3