From 064457406bda554e713aea8bada1bb066be42b8e Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期六, 23 九月 2023 12:39:29 +0800
Subject: [PATCH] 9-23 去鵷雏管理端验证
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 26 +++++++++++++++++---------
1 files changed, 17 insertions(+), 9 deletions(-)
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 f65dcc2..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);
}
//鎻愪氦
@@ -54,16 +63,12 @@
//瀹℃牳
@Override
- public String check(String name, Integer id, String result) {
+ public String check(String name, Integer id, Integer result) {
Report report = new Report();
report.setId(id);
report.setApprover(name);
report.setCheckTime(new Date());
- if (result.equals("閫氳繃")){
- report.setStatus(2);
- }else if (result.equals("涓嶉�氳繃")){
- report.setStatus(3);
- }
+ report.setStatus(result);
reportMapper.updateById(report);
return "瀹℃牳鎴愬姛!";
}
@@ -79,7 +84,10 @@
@Override
public Map<String, Object> getReportContext(String code) {
- return reportMapper.getReportContext(code);
+ Map<String, Object> reportContext = reportMapper.getReportContext(code);
+ System.out.println("========================");
+ System.out.println(reportContext);
+ return reportContext;
}
@Override
--
Gitblit v1.9.3