From 61f0ed42abb8b3a270f3dcefeff988da5e73a5fe Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 09 九月 2023 11:55:05 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
index 603864b..0f3ca73 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/controller/ReportController.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.limslaboratory.annotation.AuthHandler;
+import com.yuanchu.limslaboratory.enums.InterfaceType;
+import com.yuanchu.limslaboratory.enums.MenuEnums;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
import com.yuanchu.limslaboratory.utils.JackSonUtil;
@@ -14,7 +16,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -47,8 +48,8 @@
})
@GetMapping("/selectAllReport")
@AuthHandler
- public Result selectAllReport(Integer page, Integer pageSize, Integer status, String name) {
- IPage<ReportVo> reportPage = reportService.selectAllReport(new Page<Object>(page, pageSize), status, name);
+ public Result selectAllReport(Integer page, Integer pageSize, Integer status, String name,boolean checked) {
+ IPage<ReportVo> reportPage = reportService.selectAllReport(new Page<Object>(page, pageSize), status, name, checked);
Map<String, Object> map = new HashMap<>();
map.put("total", reportPage.getTotal());
map.put("row", reportPage.getRecords());
@@ -72,7 +73,7 @@
})
@PostMapping("/check")
@AuthHandler
- public Result check(@RequestHeader("X-Token") String token, Integer id, String result) throws Exception {
+ public Result check(@RequestHeader("X-Token") String token, Integer id, Integer result) throws Exception {
Object object = RedisUtil.get(token);
Map<String, Object> unmarshal = JackSonUtil.unmarshal(JackSonUtil.marshal(object), Map.class);
MyUtil.PrintLog(unmarshal + "-------id" + id + "=========" + result);
@@ -99,5 +100,11 @@
return Result.success(reportService.getReportContext(code));
}
+ @GetMapping("/getEnterprise")
+ @ApiOperation("鑾峰彇浼佷笟淇℃伅")
+ @AuthHandler(type = InterfaceType.SELECT,menuId = MenuEnums.checkTheReport,isAdd = true)
+ public Result getEnterprise() {
+ return Result.success(reportService.getEnterprise());
+ }
}
--
Gitblit v1.9.3