From 4780a3ac4a163ea0181d395488042ec443403f62 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期三, 21 六月 2023 18:28:52 +0800
Subject: [PATCH] BUG修复和营销统计
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java | 43 ++++++++++++++++++++++++++++++++++++++-----
1 files changed, 38 insertions(+), 5 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
index 043a529..f121387 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
@@ -5,11 +5,14 @@
import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.domain.dto.MgtBaseGetDto;
import com.ruoyi.system.domain.dto.MgtReplayStaffSuggestDto;
+import com.ruoyi.system.domain.dto.MgtStaffEditDto;
import com.ruoyi.system.domain.dto.MgtStaffSuggestPageDto;
import com.ruoyi.system.domain.dto.MgtTagStaffSuggestDto;
+import com.ruoyi.system.domain.vo.MgtDeptStaffListVo;
import com.ruoyi.system.domain.vo.MgtStaffSuggestPageVo;
import com.ruoyi.system.domain.vo.MgtStaffSuggestTagVo;
import com.ruoyi.system.service.config.StaffSuggestService;
+import com.ruoyi.system.service.staff.SysStaffService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.RequestBody;
@@ -33,15 +36,27 @@
public class MgtStaffController {
+
@Resource
private StaffSuggestService staffSuggestService;
- /*@RequestMapping(value = "/listMgtDeptStaff", method = RequestMethod.POST)
+ @Resource
+ private SysStaffService sysStaffService;
+
+ @RequestMapping(value = "/listMgtDeptStaff", method = RequestMethod.POST)
@ApiOperation(value = "获取部门员工列表")
- public R<List<MgtDeptStaffListVo>> listMgtStaffSuggestTag(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
- List<MgtStaffSuggestTagVo> mgtStaffSuggestTagVoList= staffSuggestService.listMgtStaffSuggestTag(Long.valueOf(mgtBaseGetDto.getId()));
- return R.ok(mgtStaffSuggestTagVoList);
- }*/
+ public R<List<MgtDeptStaffListVo>> listMgtDeptStaff() {
+ List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff();
+ return R.ok(mgtDeptStaffListVoList);
+ }
+
+ @RequestMapping(value = "/listMgtDeptStaffByPermission", method = RequestMethod.POST)
+ @ApiOperation(value = "通过权限获取部门员工列表")
+ public R<List<MgtDeptStaffListVo>> listMgtDeptStaffByPermission() {
+ Long userId = SecurityUtils.getUserId();
+ List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaffByPermission(userId);
+ return R.ok(mgtDeptStaffListVoList);
+ }
@RequestMapping(value = "/pageMgtStaffSuggest", method = RequestMethod.POST)
@@ -80,4 +95,22 @@
staffSuggestService.mgtEditStaffSuggestTag(mgtTagStaffSuggestDto);
return R.ok();
}
+
+ @RequestMapping(value = "/mgtEditStaff", method = RequestMethod.POST)
+ @ApiOperation(value = "平台编辑员工")
+ public R mgtEditStaff(@RequestBody MgtStaffEditDto mgtStaffEditDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtStaffEditDto.setUserId(userId);
+ sysStaffService.mgtStaffEdit(mgtStaffEditDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/mgtDeleteStaff", method = RequestMethod.POST)
+ @ApiOperation(value = "平台删除员工")
+ public R mgtStaffEdit(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtBaseGetDto.setUserId(userId);
+ sysStaffService.mgtDeleteStaff(mgtBaseGetDto);
+ return R.ok();
+ }
}
--
Gitblit v1.7.1