From c623c05868d94854e31652181570537a6493a7eb Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 25 四月 2024 09:04:25 +0800
Subject: [PATCH] 完善检验流程；检验报告流程
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
index ee1ad15..7e38126 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java
@@ -15,7 +15,9 @@
import com.yuanchu.mom.dto.ReportPageDto;
import com.yuanchu.mom.dto.SampleOrderDto;
import com.yuanchu.mom.exception.ErrorException;
+import com.yuanchu.mom.mapper.InsOrderMapper;
import com.yuanchu.mom.mapper.UserMapper;
+import com.yuanchu.mom.pojo.InsOrder;
import com.yuanchu.mom.pojo.InsReport;
import com.yuanchu.mom.service.InsReportService;
import com.yuanchu.mom.mapper.InsReportMapper;
@@ -23,6 +25,7 @@
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.ByteArrayOutputStream;
@@ -58,6 +61,9 @@
@Value("${file.path}")
private String imgUrl;
+
+ @Resource
+ private InsOrderMapper insOrderMapper;
@Override
public Map<String, Object> pageInsReport(Page page, ReportPageDto reportPageDto) {
@@ -127,6 +133,7 @@
if (isExamine==0){
//濡傛灉瀹℃牳涓嶉�氳繃
insReport.setState(0);//鎻愪氦鐘舵�佹敼涓哄緟鎻愪氦
+ return insReportMapper.updateById(insReport);
}
//鑾峰彇瀹℃牳浜虹殑绛惧悕鍦板潃
String signatureUrl = userMapper.selectById(insReport.getExamineUserId()).getSignatureUrl();
@@ -142,6 +149,7 @@
//鎵瑰噯
@Override
+ @Transactional(rollbackFor = Exception.class)
public int ratifyReport(Integer id, Integer isRatify, String ratifyTell) {
InsReport insReport = insReportMapper.selectById(id);
insReport.setIsRatify(isRatify);
@@ -153,6 +161,7 @@
if (isRatify==0){
//濡傛灉鎵瑰噯涓嶉�氳繃
insReport.setState(0);//鎻愪氦鐘舵�佹敼涓哄緟鎻愪氦
+ return insReportMapper.updateById(insReport);
}
//鑾峰彇瀹℃牳浜虹殑绛惧悕鍦板潃
String signatureUrl = userMapper.selectById(insReport.getRatifyUserId()).getSignatureUrl();
@@ -163,6 +172,10 @@
wordInsertUrl(new HashMap<String, Object>(){{
put("ratifyUrl", Pictures.ofLocal(imgUrl+"/"+signatureUrl).create());
}}, (urlS==null?url:urlS).replace("/word", wordUrl));
+ InsOrder insOrder = new InsOrder();
+ insOrder.setId(insReportMapper.selectById(id).getInsOrderId());
+ insOrder.setState(4);
+ insOrderMapper.updateById(insOrder);
return insReportMapper.updateById(insReport);
}
--
Gitblit v1.9.3