From c5138faa1c4771bfbc19de5b257e7c129c081cb8 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期一, 28 八月 2023 13:30:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspection-server/src/main/java/com/yuanchu/limslaboratory/service/impl/ReportServiceImpl.java | 46 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 44 insertions(+), 2 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 2673b2c..c5ce8ed 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
@@ -7,8 +7,10 @@
import com.yuanchu.limslaboratory.pojo.Report;
import com.yuanchu.limslaboratory.pojo.vo.ReportVo;
import com.yuanchu.limslaboratory.service.ReportService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
+import java.util.Date;
+import java.util.Map;
/**
* <p>
@@ -21,7 +23,7 @@
@Service
public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> implements ReportService {
- @Autowired
+ @Resource
private ReportMapper reportMapper;
/**
@@ -33,5 +35,45 @@
return reportMapper.selectAllReport(page, status, name);
}
+ //鎻愪氦
+ @Override
+ public String submit(Integer id) {
+ Report report = new Report();
+ report.setId(id);
+ report.setStatus(1);
+ reportMapper.updateById(report);
+ return "鎻愪氦鎴愬姛!";
+ }
+
+ //瀹℃牳
+ @Override
+ public String check(String name, Integer id, String 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);
+ }
+ reportMapper.updateById(report);
+ return "瀹℃牳鎴愬姛!";
+ }
+
+ @Override
+ public String delreport(Integer id) {
+ Report report = new Report();
+ report.setId(id);
+ report.setState(0);
+ reportMapper.updateById(report);
+ return "鍒犻櫎鎴愬姛!";
+ }
+
+ @Override
+ public Map<String, Object> getReportContext(String code) {
+ return reportMapper.getReportContext(code);
+ }
+
}
--
Gitblit v1.9.3