From 3a5ea5a84c338e0cb7a942e03a98e883a0b23115 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 07 Feb 2024 10:34:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 931e37b..e3e6cfc 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -29,6 +29,8 @@
br.town_code streetCode,
jp.principal as realName,
jp.principal_phone as phone,
+ jp.nine_type ,
+ jp.front_type ,
jt.id,
jt.NAME,
jt.type,
@@ -147,8 +149,8 @@
AND jt.create_time BETWEEN #{task.startTime} and #{task.endTime}
</if>
<!-- 场所店铺 -->
- <if test="task.reportType != null and task.reportType == 2 ">
- and jt.report_type in (2,3,4,5,6,7,8)
+ <if test="task.reportType != null">
+ and jt.report_type = #{task.reportType}
</if>
<if test="task.reportType == null">
and jt.report_type in (2,3,4,5,6,7,8)
--
Gitblit v1.9.3