From e29f147aab5b0b0b794d611b522b67b94423e3cf Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 07 九月 2023 17:56:57 +0800
Subject: [PATCH] 修改bug
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 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 dec4ee1..f11d042 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
@@ -1,15 +1,20 @@
package com.yuanchu.limslaboratory.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yuanchu.limslaboratory.mapper.EnterpriseMapper;
import com.yuanchu.limslaboratory.mapper.ReportMapper;
+import com.yuanchu.limslaboratory.pojo.Enterprise;
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
import org.springframework.stereotype.Service;
+
import javax.annotation.Resource;
import java.util.Date;
+import java.util.Map;
/**
* <p>
@@ -24,6 +29,9 @@
@Resource
private ReportMapper reportMapper;
+
+ @Resource
+ private EnterpriseMapper enterpriseMapper;
/**
* 鏌ヨ妫�楠屾姤鍛�
@@ -46,16 +54,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 "瀹℃牳鎴愬姛!";
}
@@ -69,5 +73,19 @@
return "鍒犻櫎鎴愬姛!";
}
+ @Override
+ public Map<String, Object> getReportContext(String code) {
+ Map<String, Object> reportContext = reportMapper.getReportContext(code);
+ System.out.println("========================");
+ System.out.println(reportContext);
+ return reportContext;
+ }
+
+ @Override
+ public Enterprise getEnterprise() {
+ return enterpriseMapper.selectOne(new QueryWrapper<Enterprise>());
+ }
+
+
}
--
Gitblit v1.9.3