From 36b28836d455b268db5c96167d8c2b7afa394bc6 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Fri, 8 Dec 2023 09:55:49 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/quality/service/impl/QcProCheckServiceImpl.java | 5 +++-- .../src/main/resources/mapper/quality/QcProCheckMapper.xml | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) 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