From d4450f63e6fb51ff63167c3f9654eec42bb88bee Mon Sep 17 00:00:00 2001 From: qiankanghui Date: Wed, 29 Apr 2026 11:12:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E4=BC=98=E5=8C=96=E9=A2=84?= =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=AD=97=E6=AE=B5=E8=BD=AC=E6=8D=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 支持多种输入格式（是/否、Y/N、Yes/No） - 添加输入值空值检查和空格处理 - 实现不区分大小写的英文匹配 - 统一转换为char(1)格式存储 --- .../order/service/Impl/PODetailServiceImpl.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java index 616a42a..3994c00 100644 --- a/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java +++ b/src/main/java/com/xujie/modules/order/service/Impl/PODetailServiceImpl.java @@ -254,10 +254,17 @@ public class PODetailServiceImpl extends ServiceImpl i poDetailVo.setPlanner(excelDTO.getPlanner()); poDetailVo.setRemark(excelDTO.getRemark()); - // char(1) 修复 - poDetailVo.setAdvancePayment( - "是".equals(excelDTO.getAdvancePayment()) ? "Y" : "N" - ); + // char(1) 字段转换：支持多种输入格式（是/否、Y/N、Yes/No） + String advancePaymentInput = excelDTO.getAdvancePayment(); + boolean needAdvance = false; + if (advancePaymentInput != null && !advancePaymentInput.trim().isEmpty()) { + String trimmed = advancePaymentInput.trim(); + // 支持中文"是"、英文"Y"或"Yes"（不区分大小写） + needAdvance = "是".equals(trimmed) + || "Y".equalsIgnoreCase(trimmed) + || "YES".equalsIgnoreCase(trimmed); + } + poDetailVo.setAdvancePayment(needAdvance ? "Y" : "N"); try { if (excelDTO.getWantReceiveDate() != null && !excelDTO.getWantReceiveDate().isEmpty()) {