From 1901fceb6ddaa56a57f3131191454554c3e77e68 Mon Sep 17 00:00:00 2001
From: guohongjin <guohongjin@test.com>
Date: 星期三, 01 五月 2024 13:56:51 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PsychologicalCounseling
---
common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml
index de396dd..a193814 100644
--- a/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml
+++ b/common-buiness/src/main/java/cn/stylefeng/guns/modular/business/mapper/mapping/MentalAnalysisTimeConfigMapper.xml
@@ -24,9 +24,11 @@
FROM
t_mental_analysis_time_config tc
LEFT JOIN toc_customer u ON tc.counselling_info_id = u.customer_id
- LEFT JOIN t_counselling_special_time_config stc ON stc.counselling_info_id = u.customer_id
<where>
AND u.status_flag = 1
+ <if test="workStatus != null">
+ AND u.work_status = #{workStatus}
+ </if>
<if test="mentalAnalysisStatus != null">
AND u.mental_analysis_status = #{mentalAnalysisStatus}
</if>
@@ -41,7 +43,7 @@
</if>
<if test="appointmentDay != null and appointmentDay != ''">
AND u.customer_id NOT IN (
- SELECT counselling_info_id FROM t_counselling_special_time_config stc
+ SELECT counselling_info_id FROM t_mental_analysis_special_time_config stc
WHERE stc.special_day <![CDATA[ <> ]]> #{appointmentDay} AND stc.is_cancel_day = 1
)
</if>
--
Gitblit v1.7.1