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 | 4 ++--
inspection-server/src/main/resources/mapper/ReportMapper.xml | 3 +++
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 13 +++++++++++--
inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java | 2 +-
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java | 2 +-
5 files changed, 18 insertions(+), 6 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 267e7df..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
@@ -48,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());
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
index cc8df9c..cfa7cd2 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/mapper/ReportMapper.java
@@ -23,7 +23,7 @@
* 鏌ヨ妫�楠屾姤鍛�
* @return
*/
- IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name);
+ IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name,Integer id,boolean checked);
Map<String, Object> getReportContext(String code);
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
index 1c6e3bf..940d864 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/ReportService.java
@@ -25,7 +25,7 @@
*
* @return
*/
- IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name);
+ IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name,boolean checked);
/**
* 鎻愪氦
diff --git a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
index f11d042..fba889c 100644
--- a/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
+++ b/inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java
@@ -10,7 +10,10 @@
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
+import com.yuanchu.limslaboratory.utils.RedisUtil;
+import com.yuanchu.limslaboratory.utils.ServletUtils;
import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
import javax.annotation.Resource;
import java.util.Date;
@@ -38,8 +41,14 @@
* @return
*/
@Override
- public IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name) {
- return reportMapper.selectAllReport(page, status, name);
+ public IPage<ReportVo> selectAllReport(Page<Object> page, Integer status, String name,boolean checked) {
+ Object obj = RedisUtil.get(ServletUtils.getRequest().getHeader("X-Token"));
+ Integer id=null;
+ if(checked&&!ObjectUtils.isEmpty(obj)){
+ Map loginUser = (Map) obj;
+ id=Integer.parseInt(String.valueOf(loginUser.get("id")));
+ }
+ return reportMapper.selectAllReport(page, status, name,id,checked);
}
//鎻愪氦
diff --git a/inspection-server/src/main/resources/mapper/ReportMapper.xml b/inspection-server/src/main/resources/mapper/ReportMapper.xml
index 3d08557..b71fda6 100644
--- a/inspection-server/src/main/resources/mapper/ReportMapper.xml
+++ b/inspection-server/src/main/resources/mapper/ReportMapper.xml
@@ -29,6 +29,9 @@
or i.code like concat('%', #{name}, '%')
or r.code like concat('%', #{name}, '%')
</if>
+ <if test="checked != false and id != null">
+ and i.user_id=#{id}
+ </if>
</where>
order by r.id
</select>
--
Gitblit v1.9.3