From b3cfa58a3dc8ecf898715bb8d7716df7fc02c7e3 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 27 Aug 2024 17:46:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E6=98=8E=E7=BB=86=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E5=AF=BC=E5=87=BA2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/op/quality/domain/QcCheckDetail.java | 2 +- .../resources/mapper/quality/QcStaticTableMapper.xml | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckDetail.java b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckDetail.java index 341ef0b8..cb4a6644 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckDetail.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/domain/QcCheckDetail.java @@ -27,7 +27,7 @@ public class QcCheckDetail extends BaseEntity { private String materialCode; @Excel(name = "产品名称") private String materialName; - @Excel(name = "检验结果",readConverterExp = "Y=合格,1=不合格") + @Excel(name = "检验结果",readConverterExp = "Y=合格,N=不合格") private String checkResult; @Excel(name = "缺陷描述") private String className; diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml index ca175a6b..60c3557b 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcStaticTableMapper.xml @@ -826,20 +826,23 @@ qct.income_time incomeTime, qct.order_no orderNo, qct.check_result checkResult, - qct.supplier_code supplierCode, - qct.supplier_name supplierName, + pow.workorder_name supplierCode, + be.equipment_name supplierName, qct.material_code materialCode, qct.material_name materialName, qdtc.id classCode, qdtc.class_name className from qc_check_task qct + left join pro_order_workorder pow on pow.workorder_code = qct.order_no + left join base_equipment be on be.equipment_code = pow.workorder_name left join qc_check_task_defect qctd on qctd.belong_to = qct.record_id left join qc_defect_type_class qdtc on qctd.class_id = qdtc.id where qct.check_type = #{checkType} and qct.check_status = '2' and CONVERT(varchar(4),qct.create_time, 120) = #{incomeTimeStr} and CONVERT(varchar(7),qct.create_time, 120) = #{incomeTimeStr} and CONVERT(varchar(10),qct.create_time, 120) = #{incomeTimeStr} - and qct.del_flag = '0' and qdtc.del_flag = '0' and qctd.del_flag = '0' + and qct.del_flag = '0' and qdtc.del_flag = '0' and qctd.del_flag = '0' and pow.del_flag = '0' + and be.del_flag = '0' order by qct.order_no,qct.income_time