From 624cbc9d730f1596c27b505190eb42048d8ba8ff Mon Sep 17 00:00:00 2001
From: zhanglin8526 <852614290@qq.com>
Date: 星期六, 26 八月 2023 17:34:52 +0800
Subject: [PATCH] 分账
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java | 41 ++++++++++++++++++++++++++++++++---------
1 files changed, 32 insertions(+), 9 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 85135b0..29cc75a 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
@@ -3,6 +3,9 @@
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.core.web.domain.AjaxResult;
+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.*;
@@ -14,14 +17,15 @@
import com.ruoyi.system.service.staff.SysStaffService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-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 org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
+
+import static com.ruoyi.common.core.web.domain.AjaxResult.success;
/**
* @author jqs34
@@ -30,7 +34,7 @@
* @description: TODO
* @date 2023 2023/6/11 18:36
*/
-@Api(value = "平台端员工相关接口", tags = "平台端员工相关接口", description = "平台端员工相关接口")
+@Api(value = "管理后台员工相关接口", tags = "管理后台员工相关接口", description = "管理后台员工相关接口")
@RestController
@RequestMapping("/mgt/staff")
public class MgtStaffController {
@@ -73,18 +77,24 @@
@RequestMapping(value = "/exportPageMgtStaffSuggest", method = RequestMethod.POST)
@ApiOperation(value = "导出员工建议列表")
- public void exportPageMgtStaffSuggest(@RequestBody MgtStaffSuggestPageDto mgtStaffSuggestPageDto, HttpServletResponse response) {
+ public void exportPageMgtStaffSuggest(MgtStaffSuggestPageDto mgtStaffSuggestPageDto, HttpServletResponse response) {
Long userId = SecurityUtils.getUserId();
mgtStaffSuggestPageDto.setUserId(userId);
Page<MgtStaffSuggestPageVo> page = new Page<>();
- page.setSize(2000);
- page.setCurrent(1);
+ if(mgtStaffSuggestPageDto.getPageSize() > 5000){
+ page.setSize(5000);
+ page.setCurrent(1);
+ }else{
+ page.setSize(mgtStaffSuggestPageDto.getPageSize());
+ page.setCurrent(mgtStaffSuggestPageDto.getPageNum());
+ }
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();
@@ -101,6 +111,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();
@@ -122,8 +133,9 @@
}
@RequestMapping(value = "/mgtEditStaff", method = RequestMethod.POST)
+ @Log(title = "员工管理", businessType = BusinessType.UPDATE,operContent = "编辑员工")
@ApiOperation(value = "平台编辑员工")
- public R mgtEditStaff(@RequestBody MgtStaffEditDto mgtStaffEditDto) {
+ public R mgtEditStaff(@Validated @RequestBody MgtStaffEditDto mgtStaffEditDto) {
Long userId = SecurityUtils.getUserId();
mgtStaffEditDto.setUserId(userId);
sysStaffService.mgtStaffEdit(mgtStaffEditDto);
@@ -131,6 +143,7 @@
}
@RequestMapping(value = "/mgtDeleteStaff", method = RequestMethod.POST)
+ @Log(title = "员工管理", businessType = BusinessType.DELETE,operContent = "删除员工")
@ApiOperation(value = "平台删除员工")
public R mgtStaffEdit(@RequestBody MgtBaseGetDto mgtBaseGetDto) {
Long userId = SecurityUtils.getUserId();
@@ -138,4 +151,14 @@
sysStaffService.mgtDeleteStaff(mgtBaseGetDto);
return R.ok();
}
+
+ @ApiOperation(value = "导入员工数据")
+ @PostMapping("/importSysStaff")
+ public AjaxResult importSysStaff(@RequestPart("file") MultipartFile file) throws Exception
+ {
+ ExcelUtil<MgtSysStaffImportDto> util = new ExcelUtil<MgtSysStaffImportDto>(MgtSysStaffImportDto.class);
+ List<MgtSysStaffImportDto> sysStaffImportDtoList = util.importExcel(file.getInputStream());
+ String message = sysStaffService.importSysStaff(sysStaffImportDtoList);
+ return success(message);
+ }
}
--
Gitblit v1.7.1