From edd98c54519f1f36fb561bdc1cb7aa33c6d68530 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期二, 07 五月 2024 17:35:17 +0800
Subject: [PATCH] 通过pid获取检验单当前试验室所有项目是否有检验结果后进行判断检验单是否更改成"已检"状态
---
cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java | 32 +++++++++++++++++++++++---------
1 files changed, 23 insertions(+), 9 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
index 6925d5e..7e2c211 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/controller/DepartmentController.java
@@ -1,13 +1,22 @@
package com.yuanchu.mom.controller;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
+import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.UserDto;
+import com.yuanchu.mom.dto.UserPageDto;
import com.yuanchu.mom.pojo.Department;
+import com.yuanchu.mom.pojo.User;
import com.yuanchu.mom.service.DepartmentService;
+import com.yuanchu.mom.utils.JackSonUtil;
import com.yuanchu.mom.vo.Result;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.stereotype.Controller;
+
+import java.util.Map;
/**
* <p>
@@ -24,26 +33,31 @@
public class DepartmentController {
DepartmentService departmentService;
-
+ @ValueClassify("浜哄憳鏄庣粏")
@ApiOperation(value = "娣诲姞閮ㄩ棬")
@PostMapping("/addDepartment")
- public Result addDepartment(@RequestBody Department department){
+ public Result addDepartment(@RequestBody Department department) {
return Result.success(departmentService.addDepartment(department));
}
-
+ @ValueAuth
@ApiOperation(value = "鑾峰彇閮ㄩ棬鏍�")
@GetMapping("/selectDepartment")
- public Result selectDepartment(){
+ public Result selectDepartment() {
return Result.success(departmentService.selectDepartment());
}
-
+ @ValueClassify("浜哄憳鏄庣粏")
@ApiOperation(value = "鍒犻櫎閮ㄩ棬")
@PostMapping("/delDepartment")
- public Result delDepartment(Integer id){
+ public Result delDepartment(Integer id) {
return Result.success(departmentService.delDepartment(id));
}
-
-
-
+ @ValueAuth
+ @ApiOperation(value = "鏍规嵁閫夋嫨鐨勬爲灞曠ず鐩稿叧鐨勪汉鍛�")
+ @PostMapping("/showUserById")
+ public Result showUserById(@RequestBody Map<String, Object> data) throws Exception {
+ Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
+ UserDto user = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), UserDto.class);
+ return Result.success(departmentService.showUserById(page, user));
+ }
}
--
Gitblit v1.9.3