bonus
/
gz_att
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

出行人把申请人自动带入 

Signed-off-by: lSun <15893999301@qq.com>
This commit is contained in:
lSun 2024-12-16 15:08:46 +08:00
parent f032ded697
commit a595d6a538
4 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bonus-modules/bonus-system/src/main/java/com/bonus/system/holiday/service/RequestReportServiceImpl.java
View File

@ -85,9 +85,13 @@ public class RequestReportServiceImpl implements RequestReportService {
if (StringHelper.isNotEmpty(workReportBean.getHostUserId())) {
String[] checkIds = workReportBean.getHostUserId().split(",");
for (String checkId : checkIds) {
SysUser sysUser = userMapper.selectUserById(Long.valueOf(checkId));
String userName = sysUser.getUserName();
name.append(userName).append(",");
if(checkId.equals("0")){
name.append("/").append("");
}else{
SysUser sysUser = userMapper.selectUserById(Long.valueOf(checkId));
String userName = sysUser.getUserName();
name.append(userName).append(",");
}
}
// 如果 name 不为空，移除最后一个逗号
if (name.length() > 0) {

2
bonus-modules/bonus-system/src/main/resources/mapper/basic/SysUserMapper.xml
View File

@ -275,7 +275,7 @@
sys_user
WHERE
is_active = 1
AND user_name IS NOT NULL and user_id!=#{userId}
AND user_name IS NOT NULL
</select>
<select id="checkUserNameUnique" resultType="com.bonus.system.api.domain.SysUser">
select user_id as userId, id_number as idNumber

9
bonus-modules/bonus-system/src/main/resources/mapper/evection/EvectionMapper.xml
View File

@ -67,8 +67,8 @@
<select id="getEvectionList" resultType="com.bonus.system.evection.entity.EvectionBean">
SELECT a.*,
GROUP_CONCAT( CASE WHEN a.user_ids != su.user_id THEN a.user_ids END SEPARATOR ', ' ) AS travelers,
GROUP_CONCAT( CASE WHEN a.user_names != su.user_name THEN a.user_names END SEPARATOR ', ' ) AS travelersName,
GROUP_CONCAT( a.user_ids SEPARATOR ', ' ) AS travelers,
GROUP_CONCAT( a.user_names SEPARATOR ', ' ) AS travelersName,
su.user_id ,su.user_name
FROM (
SELECT
@ -135,8 +135,8 @@
<select id="selectEvectionById"
resultType="com.bonus.system.evection.entity.EvectionBean">
SELECT a.*,
GROUP_CONCAT( CASE WHEN a.user_ids != su.user_id THEN a.user_ids END SEPARATOR ', ' ) AS travelers,
GROUP_CONCAT( CASE WHEN a.user_names != su.user_name THEN a.user_names END SEPARATOR ', ' ) AS travelersName,
GROUP_CONCAT( a.user_ids SEPARATOR ', ' ) AS travelers,
GROUP_CONCAT( a.user_names SEPARATOR ', ' ) AS travelersName,
su.user_id,
su.user_name
FROM (SELECT l.id,
@ -157,6 +157,7 @@
l.leave_form_id as uuid,
l.submit_id,
l.host_user_id,
l.host_user_name,
l.is_agree,
l.location,
l.remark

8
bonus-modules/bonus-system/src/main/resources/mapper/wechat/WechatEvectionMapper.xml
View File

@ -6,8 +6,8 @@
<select id="getEvectionList" resultType="com.bonus.system.wechat.entity.WechatEvectionBean">
SELECT a.*,
GROUP_CONCAT( CASE WHEN a.user_ids != su.user_id THEN a.user_ids END SEPARATOR ', ' ) AS travelers,
GROUP_CONCAT( CASE WHEN a.user_names != su.user_name THEN a.user_names END SEPARATOR ', ' ) AS travelersName,
GROUP_CONCAT( a.user_ids SEPARATOR ', ' ) AS travelers,
GROUP_CONCAT( a.user_names SEPARATOR ', ' ) AS travelersName,
su.user_id ,su.user_name
FROM (
SELECT
@ -72,8 +72,8 @@
<select id="selectEvectionById"
resultType="com.bonus.system.wechat.entity.WechatEvectionBean">
SELECT a.*,
GROUP_CONCAT( CASE WHEN a.user_ids != su.user_id THEN a.user_ids END SEPARATOR ', ' ) AS travelers,
GROUP_CONCAT( CASE WHEN a.user_names != su.user_name THEN a.user_names END SEPARATOR ', ' ) AS travelersName,
GROUP_CONCAT( a.user_ids SEPARATOR ', ' ) AS travelers,
GROUP_CONCAT( a.user_names SEPARATOR ', ' ) AS travelersName,
su.user_id,
su.user_name
FROM (SELECT l.id,