From 11af23e0c7976eed1211ba2ca0beae3a12e19310 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期三, 12 三月 2025 15:37:47 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java | 40 ++++++++++++++++++++++++++++++++++++++--
1 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
index 2205351..42b997e 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/UserController.java
@@ -2,13 +2,18 @@
import com.ruoyi.common.core.domain.Result;
+import com.ruoyi.common.core.domain.entity.Company;
import com.ruoyi.common.core.domain.entity.User;
+import com.ruoyi.common.core.dto.PersonDto;
+import com.ruoyi.framework.util.HeaderToken;
import com.ruoyi.system.service.UserService;
import com.ruoyi.web.controller.dto.UpdateUserDto;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
@@ -24,8 +29,11 @@
@Resource
private UserService userService;
+ @Autowired
+ private HeaderToken headerToken;
+
/**
- * todo: type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
+ *type : 1: 鑾峰彇妫�娴嬩汉鍛樹俊鎭�
type : 2: 鑾峰彇褰撳墠閮ㄩ棬(瀹為獙瀹や汉鍛�)
* @param user
* @param type
@@ -54,7 +62,7 @@
@GetMapping("/selectUserDepartmentLimsName")
@ApiOperation(value = "鑾峰彇褰撳墠鐧诲綍鐢ㄦ埛閮ㄩ棬")
public Result<?> selectUserDepartmentLimsName(){
- return Result.success("鎴愬姛", userService.selectUserDepartmentLimsName());
+ return Result.success(userService.selectUserDepartmentLimsName());
}
@PostMapping("/upUserDepardLimsId")
@@ -70,6 +78,34 @@
}
+ @ApiOperation(value = "鏌ョ湅浜轰簨绯荤粺缁勭粐鏋舵瀯")
+ @GetMapping(value = "/selectCompaniesList")
+ public Result<List<Company>> selectCompaniesList() {
+ return Result.success(headerToken.companyUrl());
+ }
+
+ @ApiOperation("鑾峰彇浜轰簨绯荤粺缁勭粐涓嬬殑浜哄憳")
+ @GetMapping(value = "/selectSimpleList")
+ public Result<?> selectSimpleList(String companyId) {
+ return Result.success(headerToken.userUrl(companyId));
+ }
+
+ @ApiOperation("灏嗕汉浜嬬郴缁熷嬀閫夌殑鍐呭杞Щ鍒版湰绯荤粺")
+ @PostMapping(value = "/addPersonUser")
+ public Result<?> addPersonUser(@RequestBody PersonDto personDto) {
+ return Result.success(userService.addPersonUser(personDto));
+ }
+
+ /**
+ * 鑾峰彇瀹為獙瀹や笅鐨勬楠屽憳鍒楄〃
+ * @return
+ */
+ @ApiOperation(value = "鑾峰彇瀹為獙瀹や笅鐨勬楠屽憳鍒楄〃")
+ @GetMapping("/getLaboratoryPersonList")
+ public Result<?> getLaboratoryPersonList() {
+ return Result.success(userService.getLaboratoryPersonList());
+ }
+
}
--
Gitblit v1.9.3