diff --git a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java index 25f57833..08c3cebd 100644 --- a/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java +++ b/op-modules/op-quality/src/main/java/com/op/quality/service/impl/QcProCheckServiceImpl.java @@ -128,6 +128,11 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Override public List getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome) { DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode()); + if("'0'".equals(qcCheckTaskIncome.getCheckStatus())){ + qcCheckTaskIncome.setDelFlag("0");//临时借用 + }else{ + qcCheckTaskIncome.setDelFlag("1"); + } List dtos = qcProCheckMapper.getCheckTaskList(qcCheckTaskIncome); for (QcCheckTaskIncome dto : dtos) { if (StringUtils.isEmpty(dto.getWorkorderCodeSap())) { diff --git a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml index 68f36fb0..24928885 100644 --- a/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml +++ b/op-modules/op-quality/src/main/resources/mapper/quality/QcProCheckMapper.xml @@ -276,9 +276,9 @@ and CONVERT(varchar(10),qct.check_time, 120) = #{checkTimeStart} and qctu.check_man_code = #{checkManCode} and qct.check_status in (${checkStatus}) - + and (CONVERT(varchar(10),qct.create_time, 120) >= CONVERT(varchar(10),DATEADD(DAY, -1, GETDATE()), 120)) - + order by qct.create_time desc