From e776dcaa5aa2416634644c2c7ac333ee95738b95 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 17 三月 2025 15:57:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsReportServiceImpl.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 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 4451297..81e9fb9 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
@@ -256,7 +256,7 @@
/*妫�楠屽崟缁撴潫*/
List<InsReport> insReports = insReportMapper.selectList(Wrappers.<InsReport>lambdaQuery().eq(InsReport::getInsOrderId, insReport.getInsOrderId()));
List<Integer> list = insReports.stream().map(InsReport::getIsRatify).distinct().collect(Collectors.toList());
- if (list.size()==1 && list.contains(1)){
+ if (list.size() == 1 && list.contains(1)) {
InsOrder insOrder = insOrderMapper.selectById(insReport.getInsOrderId());
insOrder.setState(4);
insOrderMapper.updateById(insOrder);
@@ -377,7 +377,7 @@
if (insReportDto.getState() == 1) {
List<InsReportDto1> insReportDto1s = insReportDto.getInsReportDto1s();
for (InsReportDto1 insReportDto1 : insReportDto1s) {
- if (ObjectUtils.isNotEmpty(insReportDto1.getInsReportDto2s())){
+ if (ObjectUtils.isNotEmpty(insReportDto1.getInsReportDto2s())) {
wordUtils.generateReport(insReportDto.getId(), insReportDto1);
}
}
@@ -390,16 +390,15 @@
//鏌ュ嚭璇ヨ鍗曚笅姣忎釜绔欑偣涓嬬殑妫�楠屾鏁�
@Override
- public List<InsOrderStateDto> getInsOrderStateCount(Integer id) {
+ public List<InsOrderStateDto> getInsOrderStateCount(Integer id, Integer sampleId) {
List<InsOrderStateDto> insOrderStateDtos = new ArrayList<>();
- List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, id));
- for (InsSample insSample : insSamples) {
- InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
- insOrderStateDto.setInsSample(insSample);
- List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
- insOrderStateDto.setInsOrderStates(insOrderStates);
- insOrderStateDtos.add(insOrderStateDto);
- }
+ InsSample insSample = insSampleMapper.selectById(sampleId);
+ InsOrderStateDto insOrderStateDto = new InsOrderStateDto();
+ insOrderStateDto.setInsSample(insSample);
+ List<InsOrderState> insOrderStates = insOrderStateMapper.getInsOrderStateCount(id, insSample.getId());
+ insOrderStateDto.setInsOrderStates(insOrderStates);
+ insOrderStateDtos.add(insOrderStateDto);
+
return insOrderStateDtos;
}
--
Gitblit v1.9.3