diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml index c4193d6da..8287c345b 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcCheckSampleTaskMapper.xml @@ -55,22 +55,22 @@ left join pro_order_workorder pow ON pow.workorder_code = task.order_no - and CONVERT(VARCHAR(10), create_time ,23) #{queryDate} + and CONVERT(VARCHAR(10), task.create_time ,23) #{queryDate} - and CONVERT(VARCHAR(10), sample_time ,23) = ]]> #{startSampleDate} + and CONVERT(VARCHAR(10), task.sample_time ,23) = ]]> #{startSampleDate} - and CONVERT(VARCHAR(10), sample_time ,23) #{endSampleDate} + and CONVERT(VARCHAR(10), task.sample_time ,23) #{endSampleDate} - and material_name like concat('%', #{materialName}, '%') + and task.material_name like concat('%', #{materialName}, '%') and SUBSTRING ( pow.workorder_code_sap, 4, 12 ) #{workOrderCodeSap} - order by sample_time desc,task.create_time desc + order by task.sample_time desc,task.create_time desc