From d63b0929a9756d0b1e1d4129bf16ab119f650ffc Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 07 八月 2024 08:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
inspect-server/src/main/resources/mapper/InsOrderMapper.xml | 2 +-
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java | 9 ++++++++-
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 1 +
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
index b7ec04d..84338ac 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -31,6 +31,7 @@
@ApiModelProperty("鏍峰搧鏁伴噺")
private Integer sampleNum;
+ @ValueTableShow(3)
@ApiModelProperty("鏍峰搧缂栧彿")
private String sampleCode;
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
index f2ef341..649278d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderServiceImpl.java
@@ -115,7 +115,14 @@
}
}
}
- map.put("body", insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), laboratory));
+ IPage<SampleOrderDto> sampleOrderDtoIPage = insOrderMapper.selectInsOrderPage(page, QueryWrappers.queryWrappers(sampleOrderDto), laboratory);
+ sampleOrderDtoIPage.getRecords().forEach(i -> {
+ if (i.getSampleCode().contains("锛�")) {
+ String[] split = i.getSampleCode().split("锛�");
+ i.setSampleCode(split[0]);
+ }
+ });
+ map.put("body", sampleOrderDtoIPage);
return map;
}
diff --git a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
index bc76b6c..5efe060 100644
--- a/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InsOrderMapper.xml
@@ -70,7 +70,7 @@
ir.url_s,
sample_counts.sample_num,
CONCAT(ROUND(approved_product_counts.approved_count / total_product_counts.total_count * 100, 2), '%') AS insProgress,
- GROUP_CONCAT(DISTINCT isa.sample_code SEPARATOR ' ') AS sample_code,
+ GROUP_CONCAT(DISTINCT isa.sample_code SEPARATOR '锛�') AS sample_code,
GROUP_CONCAT(DISTINCT isa.sample SEPARATOR ' ') AS sample_name,
GROUP_CONCAT(DISTINCT isa.model SEPARATOR ' ') AS sample_model,
u.name
--
Gitblit v1.9.3