From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
index d709791..8bc58c2 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskNoFraudReportingMapper.xml
@@ -64,6 +64,11 @@
<if test="place.placeName != null and place.placeName != ''">
and jp.place_name like concat('%', #{place.placeName},'%')
</if>
+
+ <if test="place.startTime != null and place.startTime != '' and place.endTime != null and place.endTime != '' ">
+ AND jtnfr.create_time BETWEEN #{place.startTime} and #{place.endTime}
+ </if>
+
<if test="place.principal != null and place.principal != ''">
and jp.principal like concat('%', #{place.principal},'%')
</if>
@@ -82,7 +87,7 @@
and jtnfr.pcs_name like concat('%', #{place.pcsName},'%')
</if>
- <if test="isAdministrator==2">
+ <if test="isAdministrator==2 and place.createUser == null">
<choose>
<when test="place.roleName != null and place.roleName != ''">
<if test="place.roleName=='wgy'">
@@ -162,6 +167,8 @@
jpr.rectification_image_urls,
jpr.rectification_remark,
jpr.rectification_time,
+ jpr.pdf_path,
+ jpr.original_name,
jpgi.items_name
from jczz_task_place_record jpr
LEFT JOIN jczz_patrol_group_item jpgi on jpr.item_id = jpgi.id
--
Gitblit v1.9.3