From dcbe21414886c6c982e2ff7339f8be6977093585 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 27 十一月 2023 14:17:19 +0800
Subject: [PATCH] 完成盘点时进行出入库
---
consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
index d687248..edae61d 100644
--- a/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/FinSysTenantUserController.java
@@ -6,6 +6,7 @@
import com.alibaba.excel.event.AnalysisEventListener;
import com.alibaba.excel.exception.ExcelDataConvertException;
import com.consum.base.BaseController;
+import com.consum.base.core.utils.MapperUtil;
import com.consum.base.pojo.FinSysTenantUserSearchParam;
import com.consum.base.pojo.FinSysTenantUserUpdParam;
import com.consum.base.pojo.response.DepartmentVO;
@@ -35,6 +36,7 @@
import com.walker.infrastructure.utils.PhoneNumberUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
+import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -45,6 +47,7 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
import java.util.Optional;
import java.util.Set;
@@ -65,6 +68,7 @@
* @Author wh
* @Date 2023/7/17 14:16
*/
+@Api(value = "鏈烘瀯鐢ㄦ埛淇℃伅", tags = "鏈烘瀯鐢ㄦ埛淇℃伅")
@RestController
@RequestMapping("/pc/fin/sys/tenant/user")
public class FinSysTenantUserController extends BaseController {
@@ -176,6 +180,18 @@
e.printStackTrace();
}
return ResponseValue.success(pager);
+ }
+
+
+ @ApiOperation(value = "鏍规嵁鏈烘瀯id鏌ヨ鐢ㄦ埛", notes = "鏍规嵁鏈烘瀯id鏌ヨ鐢ㄦ埛")
+ @ApiImplicitParam(name = "tenantId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
+ @GetMapping("/query/user")
+ public ResponseValue queryUserByTenantId(Long tenantId) {
+
+ FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
+ finSysTenantUser.setTenantId(String.valueOf(tenantId));
+ List<FinSysTenantUser> result = finSysTenantUserService.select(finSysTenantUser);
+ return ResponseValue.success(result);
}
@@ -971,14 +987,18 @@
departmentVO.setId(id);
departmentVO.setName(department.getName());
departmentVO.setType("department");
- FinSysTenantUser finSysTenantUser = new FinSysTenantUser();
- finSysTenantUser.setSysDeptId(id);
- List<FinSysTenantUser> tenantUserList = finSysTenantUserService.select(finSysTenantUser);
+
+ String sql = "SELECT SYS_USER_ID,USER_NAME FROM "
+ + "fin_sys_tenant_user "
+ + "WHERE SYS_DEPT_ID =:deptId AND SYS_USER_ID NOT IN(SELECT MANAGER_ID FROM base_warehouse_manager)";
+ Map<String, Object> param = new HashMap<>();
+ param.put("deptId", id);
+ List<Map<String, Object>> select = finSysTenantUserService.select(sql, param, new MapperUtil());
List<UserVO> userVOList = Lists.newArrayList();
- tenantUserList.forEach(user -> {
+ select.forEach(user -> {
UserVO userVO = new UserVO();
- userVO.setId(user.getId());
- userVO.setName(user.getUserName());
+ userVO.setId((Long) user.get("sysUserId"));
+ userVO.setName(user.get("userName").toString());
userVO.setType("user");
userVOList.add(userVO);
});
--
Gitblit v1.9.1