检验明细结果导出2

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;

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,
+            pow.workorder_name supplierCode,
-            qct.supplier_name supplierName,
+            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'
         <if test="ymdms == 'yyyy'">and CONVERT(varchar(4),qct.create_time, 120) = #{incomeTimeStr}</if>
         <if test="ymdms == 'mm'">and CONVERT(varchar(7),qct.create_time, 120) = #{incomeTimeStr}</if>
         <if test="ymdms == 'dd'"> and CONVERT(varchar(10),qct.create_time, 120) = #{incomeTimeStr}</if>
-        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
     </select>
 </mapper>