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 12f7129a..183e628f 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 @@ -119,8 +119,9 @@ public class QcProCheckServiceImpl implements QcProCheckService { @Override public List getCheckTaskList(QcCheckTaskIncome qcCheckTaskIncome) { - DynamicDataSourceContextHolder.push("ds_"+qcCheckTaskIncome.getFactoryCode()); - return qcProCheckMapper.getCheckTaskList(qcCheckTaskIncome); + DynamicDataSourceContextHolder.push(qcCheckTaskIncome.getFactoryCode()); + List dtos = qcProCheckMapper.getCheckTaskList(qcCheckTaskIncome); + return dtos; } @Override 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 6d96fc3a..7693fcec 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 @@ -254,7 +254,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and qct.del_flag = '0' and qct.check_type = #{checkType} and qct.check_man_code = #{checkManCode} - and qct.check_status in (#{checkStatus}) + and qct.check_status in (${checkStatus}) order by qct.create_time desc