From 9ec0ecb6e1a81f1ce55935b9ba7fbda6c3a8810a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 15 十月 2025 15:27:00 +0800
Subject: [PATCH] 员工导入
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java | 36 +++++++++++++++++++-----------------
1 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
index 38b549b..5b77a38 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/OaNotificationController.java
@@ -8,7 +8,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.entity.TDept;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.system.model.OaNotifationUser;
+import com.ruoyi.system.model.OaNotificationUser;
import com.ruoyi.system.model.OaNotification;
import com.ruoyi.system.query.NotificationListQuery;
import com.ruoyi.system.service.*;
@@ -19,6 +19,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -51,7 +52,8 @@
*/
@ApiOperation("消息通知分页列表")
@PostMapping("/pageList")
- public R<PageInfo<NotificationVO>> pageList(@RequestBody NotificationListQuery query) {
+ public R<PageInfo<NotificationVO>> pageList(@RequestBody NotificationListQuery query
+ ) {
return R.ok(oaNotificationService.pageList(query));
}
@@ -63,8 +65,8 @@
List<String> notificationIds = Arrays.asList(ids.split(","));
// 删除后 将已发送的消息通知一并删除
oaNotificationService.removeBatchByIds(notificationIds);
- oaNotifationUserService.remove(new LambdaQueryWrapper<OaNotifationUser>()
- .in(OaNotifationUser::getNotificationId,notificationIds));
+ oaNotifationUserService.remove(new LambdaQueryWrapper<OaNotificationUser>()
+ .in(OaNotificationUser::getNotificationId,notificationIds));
return R.ok();
}
@Log(title = "消息通知-新增消息", businessType = BusinessType.INSERT)
@@ -72,28 +74,28 @@
@PostMapping(value = "/add")
public R<Boolean> add( @RequestBody OaNotification dto) {
oaNotificationService.save(dto);
- ArrayList<OaNotifationUser> oaNotifationUsers = new ArrayList<>();
+ ArrayList<OaNotificationUser> oaNotificationUsers = new ArrayList<>();
// 发送消息通知
if (dto.getType()){
// 指定人员发送
Arrays.asList(dto.getUserIds().split(","))
.forEach(userId -> {
- OaNotifationUser oaNotifationUser = new OaNotifationUser();
- oaNotifationUser.setUserId(Integer.parseInt(userId));
- oaNotifationUser.setNotificationId(dto.getId());
- oaNotifationUsers.add(oaNotifationUser);
+ OaNotificationUser oaNotificationUser = new OaNotificationUser();
+ oaNotificationUser.setUserId(Integer.parseInt(userId));
+ oaNotificationUser.setNotificationId(dto.getId());
+ oaNotificationUsers.add(oaNotificationUser);
});
}else{
// 所有人发送
List<SysUser> sysUsers = sysUserService.selectAllList();
sysUsers.forEach(sysUser -> {
- OaNotifationUser oaNotifationUser = new OaNotifationUser();
- oaNotifationUser.setUserId(sysUser.getUserId().intValue());
- oaNotifationUser.setNotificationId(dto.getId());
- oaNotifationUsers.add(oaNotifationUser);
+ OaNotificationUser oaNotificationUser = new OaNotificationUser();
+ oaNotificationUser.setUserId(sysUser.getUserId().intValue());
+ oaNotificationUser.setNotificationId(dto.getId());
+ oaNotificationUsers.add(oaNotificationUser);
});
}
- oaNotifationUserService.saveBatch(oaNotifationUsers);
+ oaNotifationUserService.saveBatch(oaNotificationUsers);
return R.ok();
}
@ApiOperation(value = "消息通知详情")
@@ -105,7 +107,7 @@
StringBuilder deptName = new StringBuilder();
List<TDept> tDepts = deptService.list();
List<SysUser> sysUsers = sysUserService.selectAllList();
- List<OaNotifationUser> notifationUsers = oaNotifationUserService.lambdaQuery().eq(OaNotifationUser::getNotificationId, id)
+ List<OaNotificationUser> notifationUsers = oaNotifationUserService.lambdaQuery().eq(OaNotificationUser::getNotificationId, id)
.list();
Map<Integer, String> deptMap = tDepts.stream().collect(Collectors.toMap(TDept::getId, TDept::getDeptName));
Map<Long, SysUser> userMap = sysUsers.stream().collect(Collectors.toMap(SysUser::getUserId, e->e));
@@ -149,7 +151,7 @@
}
List<NotificationUserDetailVO> notificationUserDetailVOS = new ArrayList<>();
- for (OaNotifationUser notifationUser : notifationUsers) {
+ for (OaNotificationUser notifationUser : notifationUsers) {
NotificationUserDetailVO notificationUserDetailVO = new NotificationUserDetailVO();
BeanUtils.copyProperties(notifationUser, notificationUserDetailVO);
SysUser sysUser = userMap.get(notifationUser.getUserId().longValue());
@@ -164,7 +166,7 @@
}
notificationDetailVO.setNotificationUserDetailVOS(notificationUserDetailVOS);
- return R.ok();
+ return R.ok(notificationDetailVO);
}
}
--
Gitblit v1.7.1