From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java | 85 +++++++++++++++++++++++++++++++++++++-----
1 files changed, 75 insertions(+), 10 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..3471950 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
@@ -2,22 +2,28 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.poi.ExcelUtil;
+import com.ruoyi.common.log.annotation.Log;
+import com.ruoyi.common.log.enums.BusinessType;
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.MgtStaffSuggestPageDto;
-import com.ruoyi.system.domain.dto.MgtTagStaffSuggestDto;
+import com.ruoyi.system.domain.dto.*;
+import com.ruoyi.system.domain.vo.MgtDeptStaffListVo;
+import com.ruoyi.system.domain.vo.MgtStaffPageVo;
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.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
@@ -33,15 +39,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)
@@ -52,11 +70,25 @@
Page<MgtStaffSuggestPageVo> page = new Page<>();
page.setSize(mgtStaffSuggestPageDto.getPageSize());
page.setCurrent(mgtStaffSuggestPageDto.getPageNum());
- List<MgtStaffSuggestPageVo> mgtShopSuggestPageVoList = staffSuggestService.pageMgtStaffSuggest(page,mgtStaffSuggestPageDto);
- return R.ok(page.setRecords(mgtShopSuggestPageVoList));
+ List<MgtStaffSuggestPageVo> staffSuggestPageVoList = staffSuggestService.pageMgtStaffSuggest(page,mgtStaffSuggestPageDto);
+ return R.ok(page.setRecords(staffSuggestPageVoList));
+ }
+
+ @RequestMapping(value = "/exportPageMgtStaffSuggest", method = RequestMethod.POST)
+ @ApiOperation(value = "导出员工建议列表")
+ public void exportPageMgtStaffSuggest(@RequestBody MgtStaffSuggestPageDto mgtStaffSuggestPageDto, HttpServletResponse response) {
+ Long userId = SecurityUtils.getUserId();
+ mgtStaffSuggestPageDto.setUserId(userId);
+ Page<MgtStaffSuggestPageVo> page = new Page<>();
+ page.setSize(2000);
+ page.setCurrent(1);
+ List<MgtStaffSuggestPageVo> staffSuggestPageVoList = staffSuggestService.pageMgtStaffSuggest(page,mgtStaffSuggestPageDto);
+ ExcelUtil<MgtStaffSuggestPageVo> util = new ExcelUtil<MgtStaffSuggestPageVo>(MgtStaffSuggestPageVo.class);
+ util.exportExcel(response, staffSuggestPageVoList, "员工建议列表");
}
@RequestMapping(value = "/mgtReplayStaffSuggest", method = RequestMethod.POST)
+ @Log(title = "建议管理", businessType = BusinessType.UPDATE,operContent = "平台回复会员建议")
@ApiOperation(value = "平台回复会员建议")
public R mgtReplayStaffSuggest(@RequestBody MgtReplayStaffSuggestDto mgtReplayStaffSuggestDto) {
Long userId = SecurityUtils.getUserId();
@@ -73,6 +105,7 @@
}
@RequestMapping(value = "/mgtEditStaffSuggestTag", method = RequestMethod.POST)
+ @Log(title = "建议管理", businessType = BusinessType.UPDATE,operContent = "编辑会员建议标签")
@ApiOperation(value = "平台编辑会员建议标签")
public R mgtEditStaffSuggestTag(@RequestBody MgtTagStaffSuggestDto mgtTagStaffSuggestDto) {
Long userId = SecurityUtils.getUserId();
@@ -80,4 +113,36 @@
staffSuggestService.mgtEditStaffSuggestTag(mgtTagStaffSuggestDto);
return R.ok();
}
+
+ @RequestMapping(value = "/pageMgtStaff", method = RequestMethod.POST)
+ @ApiOperation(value = "平台获取员工列表")
+ public R<Page<MgtStaffPageVo>> pageMgtStaff(@RequestBody MgtStaffPageDto mgtStaffPageDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtStaffPageDto.setUserId(userId);
+ Page<MgtStaffPageVo> page = new Page<>();
+ page.setSize(mgtStaffPageDto.getPageSize());
+ page.setCurrent(mgtStaffPageDto.getPageNum());
+ List<MgtStaffPageVo> staffPageVoList = sysStaffService.pageMgtStaff(page,mgtStaffPageDto);
+ return R.ok(page.setRecords(staffPageVoList));
+ }
+
+ @RequestMapping(value = "/mgtEditStaff", method = RequestMethod.POST)
+ @Log(title = "员工管理", businessType = BusinessType.UPDATE,operContent = "编辑员工")
+ @ApiOperation(value = "平台编辑员工")
+ public R mgtEditStaff(@Validated @RequestBody MgtStaffEditDto mgtStaffEditDto) {
+ Long userId = SecurityUtils.getUserId();
+ mgtStaffEditDto.setUserId(userId);
+ sysStaffService.mgtStaffEdit(mgtStaffEditDto);
+ return R.ok();
+ }
+
+ @RequestMapping(value = "/mgtDeleteStaff", method = RequestMethod.POST)
+ @Log(title = "员工管理", businessType = BusinessType.DELETE,operContent = "删除员工")
+ @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