From 3a83be3db09481c3719e6b86bc6265bcd431422a Mon Sep 17 00:00:00 2001
From: 吴羡 <16976746+Xian-TT3@user.noreply.gitee.com>
Date: 星期四, 05 十一月 2026 11:48:13 +0800
Subject: [PATCH] 修复检验委托书字段绑定错误
---
cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
index e11c031..6300b12 100644
--- a/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
+++ b/cnas-process/src/main/java/com/ruoyi/process/service/impl/InspectionOrderServiceImpl.java
@@ -808,21 +808,30 @@
.orderByAsc(InspectionOrderDetail::getInspectionOrderDetailId));
List<String> detailEntrustCodes = buildDetailEntrustCodes(inspectionOrder.getEntrustCode(), list);
List<InspectionOrderDetailExportDto> detailList = new ArrayList<>();
- for (int i = 0; i < list.size(); i++) {
- InspectionOrderDetail inspectionOrderDetail = list.get(i);
+ if (list.isEmpty()) {
InspectionOrderDetailExportDto row = new InspectionOrderDetailExportDto();
- row.setSampleName(StrUtil.isNotBlank(inspectionOrderDetail.getSampleName())
- ? inspectionOrderDetail.getSampleName() : inspectionOrder.getSampleName());
- row.setSampleNumber(inspectionOrderDetail.getSampleNumber());
- row.setTestItem(inspectionOrderDetail.getTestItem());
- row.setQuantity(StrUtil.isNotBlank(inspectionOrderDetail.getQuantity())
- ? inspectionOrderDetail.getQuantity() : inspectionOrder.getQuantity());
- row.setSampleStatus(StrUtil.isNotBlank(inspectionOrderDetail.getSampleStatus())
- ? inspectionOrderDetail.getSampleStatus() : inspectionOrder.getSampleStatus());
- row.setTestStandard(inspectionOrderDetail.getTestStandard());
- row.setRemark(inspectionOrderDetail.getRemark());
- row.setEntrustCode(detailEntrustCodes.get(i));
+ row.setSampleName(inspectionOrder.getSampleName());
+ row.setQuantity(inspectionOrder.getQuantity());
+ row.setSampleStatus(inspectionOrder.getSampleStatus());
+ row.setEntrustCode(inspectionOrder.getEntrustCode());
detailList.add(row);
+ } else {
+ for (int i = 0; i < list.size(); i++) {
+ InspectionOrderDetail inspectionOrderDetail = list.get(i);
+ InspectionOrderDetailExportDto row = new InspectionOrderDetailExportDto();
+ row.setSampleName(StrUtil.isNotBlank(inspectionOrderDetail.getSampleName())
+ ? inspectionOrderDetail.getSampleName() : inspectionOrder.getSampleName());
+ row.setSampleNumber(inspectionOrderDetail.getSampleNumber());
+ row.setTestItem(inspectionOrderDetail.getTestItem());
+ row.setQuantity(StrUtil.isNotBlank(inspectionOrderDetail.getQuantity())
+ ? inspectionOrderDetail.getQuantity() : inspectionOrder.getQuantity());
+ row.setSampleStatus(StrUtil.isNotBlank(inspectionOrderDetail.getSampleStatus())
+ ? inspectionOrderDetail.getSampleStatus() : inspectionOrder.getSampleStatus());
+ row.setTestStandard(inspectionOrderDetail.getTestStandard());
+ row.setRemark(inspectionOrderDetail.getRemark());
+ row.setEntrustCode(detailEntrustCodes.get(i));
+ detailList.add(row);
+ }
}
inspectionOrderExportDto.setProjectName(detailList.size() + "涓牱鍝�");
writeInspectionOrderExport(inspectionOrderExportDto, detailList, response);
@@ -834,7 +843,7 @@
// 鑾峰彇璺緞
InputStream inputStream = this.getClass().getResourceAsStream("/static/inspection-order.docx");
Configure configure = Configure.builder()
- .bind("inspectionOrderDetailList", new HackLoopTableRenderPolicy())
+ .bind("inspectionOrderDetailList", new HackLoopTableRenderPolicy("[[", "]]"))
.build();
XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
new HashMap<String, Object>() {{
@@ -861,7 +870,7 @@
}
private InspectionOrderExportDto extracted(InspectionOrder inspectionOrder, InsOrder insOrder) {
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy骞碝M鏈坉d鏃�");
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy骞碝鏈坉鏃�");
InspectionOrderExportDto inspectionOrderExportDto = new InspectionOrderExportDto();
BeanUtils.copyProperties(inspectionOrder, inspectionOrderExportDto);
--
Gitblit v1.9.3