From 7bcd0d2d7510cb2ba67099cd768e1b2b6d047dc2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Thu, 22 Feb 2024 17:16:27 +0800
Subject: [PATCH] 投票人员查询优化
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 38 ++++++++++++++++++++++++++++++++++----
1 files changed, 34 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 670740b..881a73f 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -45,6 +45,8 @@
import org.springblade.core.tool.utils.StringPool;
import org.springblade.core.tool.utils.StringUtil;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.excel.PoliceUserExcel;
+import org.springblade.modules.system.excel.PoliceUserImporter;
import org.springblade.modules.system.excel.UserExcel;
import org.springblade.modules.system.excel.UserImporter;
import org.springblade.modules.system.service.IUserService;
@@ -134,7 +136,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "搜索用户", notes = "传入name")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<List<UserVO>> searchUser(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<List<UserVO>> searchUser(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().listVO(pages.getRecords()));
}
@@ -159,7 +161,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
// @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -405,14 +407,23 @@
return R.data(userService.getUserInfoByDistrictId(districtId, building));
}
+ /**
+ * 通过小区id查询物业人员/网格人员
+ */
+ @GetMapping("/getUserInfoByDistrictIds")
+ @ApiOperation(value = "查询物业人员By小区id", notes = "houseCode")
+ public R getUserInfoByDistrictIds(@RequestParam("districtIds") String districtIds) {
+ return R.data(userService.getUserInfoByDistrictIds(districtIds));
+ }
+
/**
* 通过机构查询物业公司人员
*/
@GetMapping("/getUserInfoByPropertyCompanyId")
@ApiOperation(value = "通过机构查询物业公司人员", notes = "propertyCompanyId")
- public R getUserInfoByPropertyId(@RequestParam("propertyCompanyId") String propertyCompanyId) {
- return R.data(userService.getUserInfoByPropertyId(propertyCompanyId));
+ public R getUserInfoByPropertyId(@RequestParam("propertyCompanyId") String propertyCompanyId,@RequestParam("roleId") String roleId) {
+ return R.data(userService.getUserInfoByPropertyId(propertyCompanyId,roleId));
}
/**
@@ -423,4 +434,23 @@
return R.data(userService.handleUserDept());
}
+ /**
+ * 处理漏绑定的user_dept
+ */
+ @GetMapping("/handleUser")
+ public R handleUser() {
+ return R.data(userService.handleUser());
+ }
+
+
+ /**
+ * 民警数据导入
+ */
+ @PostMapping("/policemanDataHandle")
+ public R policemanDataHandle(MultipartFile file) {
+ PoliceUserImporter policeUserImporter = new PoliceUserImporter(userService);
+ ExcelUtil.save(file, policeUserImporter, PoliceUserExcel.class);
+ return R.success("操作成功");
+ }
+
}
--
Gitblit v1.9.3