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 | 67 ++++++++++++++++++++++++++++++++- 1 files changed, 64 insertions(+), 3 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 702f2ae..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 @@ -1,16 +1,23 @@ 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.beans.factory.annotation.Autowired; +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; +import java.util.Map; /** * <p> @@ -26,14 +33,68 @@ @Resource private ReportMapper reportMapper; + @Resource + private EnterpriseMapper enterpriseMapper; + /** * 鏌ヨ妫�楠屾姤鍛� * @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); } + //鎻愪氦 + @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, Integer result) { + Report report = new Report(); + report.setId(id); + report.setApprover(name); + report.setCheckTime(new Date()); + report.setStatus(result); + 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) { + 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