From fc72c9174c705d3b2d7e40e687c04e348bfe098f Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期四, 24 八月 2023 10:53:08 +0800
Subject: [PATCH] LIMS管理系统框架-开发8-24组织架构后端完成
---
standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java | 12 ++++++++++++
standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java | 2 ++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java | 2 ++
standard-server/src/main/resources/mapper/OrganizationalMapper.xml | 7 +++++++
standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java | 5 +++++
5 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java
index 6980e9f..83ea0de 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/controller/OrganizationalController.java
@@ -2,6 +2,7 @@
import com.yuanchu.limslaboratory.pojo.Organizational;
import com.yuanchu.limslaboratory.service.OrganizationalService;
+import com.yuanchu.limslaboratory.utils.MyUtil;
import com.yuanchu.limslaboratory.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -38,6 +39,17 @@
return Result.success(organizationalTree);
}
+ @ApiOperation(value = "鏍规嵁鐐瑰嚮Id鏌ヨ閮ㄩ棬")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(value = "閮ㄩ棬ID", name = "departmentId", dataTypeClass = Integer.class)
+ })
+ @GetMapping("/table")
+ public Result<?> getDepartmentListTable(Integer departmentId) {
+ MyUtil.PrintLog(departmentId.toString());
+ List<Map<String, Object>> departmentListTable = organizationalService.getDepartmentListTable(departmentId);
+ return Result.success(departmentListTable);
+ }
+
@ApiOperation(value = "娣诲姞閮ㄩ棬")
@PostMapping("/add")
public Result<?> addDepartment(@RequestBody @Validated Organizational organizational) {
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java
index 3facef4..58a8be5 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/mapper/OrganizationalMapper.java
@@ -17,4 +17,6 @@
public interface OrganizationalMapper extends BaseMapper<Organizational> {
List<Map<String, Object>> OrganizationalTree(Integer father_id);
+
+ List<Map<String, Object>> getDepartmentListTable(Integer departmentId);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java
index dd33421..2e7ec39 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/OrganizationalService.java
@@ -23,4 +23,6 @@
Integer updateDepartment(Integer id, Organizational organizational);
Integer deleteDepartment(Integer id);
+
+ List<Map<String, Object>> getDepartmentListTable(Integer departmentId);
}
diff --git a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
index 6ae1567..3b5fffe 100644
--- a/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
+++ b/standard-server/src/main/java/com/yuanchu/limslaboratory/service/impl/OrganizationalServiceImpl.java
@@ -65,4 +65,9 @@
updateWrapper.set(Organizational::getState, 0);
return organizationalMapper.update(new Organizational(), updateWrapper);
}
+
+ @Override
+ public List<Map<String, Object>> getDepartmentListTable(Integer departmentId) {
+ return organizationalMapper.getDepartmentListTable(departmentId);
+ }
}
diff --git a/standard-server/src/main/resources/mapper/OrganizationalMapper.xml b/standard-server/src/main/resources/mapper/OrganizationalMapper.xml
index 5d2e231..e0ab681 100644
--- a/standard-server/src/main/resources/mapper/OrganizationalMapper.xml
+++ b/standard-server/src/main/resources/mapper/OrganizationalMapper.xml
@@ -11,4 +11,11 @@
<select id="OrganizationalTree" resultMap="OrganizationalMap">
SELECT o.id, o.`department` FROM organizational o where o.`father_id` = #{father_id}
</select>
+
+ <select id="getDepartmentListTable" resultType="map">
+ SELECT o.`id`, o.`department`
+ FROM organizational o
+ WHERE o.`father_id` = #{departmentId}
+ AND o.`state` = 1
+ </select>
</mapper>
--
Gitblit v1.9.3