From 56eb31c67b9af5bebd6bcd3bf0389c21b5c06cd2 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Mon, 15 Jan 2024 11:25:11 +0800
Subject: [PATCH] 场所，用户三色任务查询修改
---
src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml | 6 +++---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 8 ++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
index 8174be5..f3a918f 100644
--- a/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
+++ b/src/main/java/org/springblade/modules/house/mapper/HouseholdMapper.xml
@@ -855,7 +855,7 @@
left join jczz_user_house_label juhl on juhl.household_id = jh.id
where jh.is_deleted = 0
and juhl.lable_type = 1
- and juhl.color = '#30D17C'
+ and juhl.color = 'green'
and jh.id in (
select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(),
create_time )=30
@@ -877,7 +877,7 @@
left join jczz_user_house_label juhl on juhl.household_id = jh.id
where jh.is_deleted = 0
and juhl.lable_type = 1
- and juhl.color = '#FFB42B'
+ and juhl.color = 'yellow'
and jh.id in (
select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(),
create_time )=14
@@ -900,7 +900,7 @@
left join jczz_user_house_label juhl on juhl.household_id = jh.id
where jh.is_deleted = 0
and juhl.lable_type = 1
- and juhl.color = '#EA1F1F'
+ and juhl.color = 'red'
and jh.id in (
select household_id from jczz_grid_work_log where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(),
create_time )=7
diff --git a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
index d9511a9..da539ad 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -197,7 +197,7 @@
select jp.*,jppl.poi_code as label from jczz_place jp
left join jczz_place_poi_label jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jppl.type = 3
- and jppl.color = '#30D17C'
+ and jppl.color = 'green'
and jp.principal_user_id is not null
and jp.house_code != ''
and jp.id in (
@@ -219,7 +219,7 @@
select jp.*,jppl.poi_code as label from jczz_place jp
left join jczz_place_poi_label jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jppl.type = 3
- and jppl.color = '#FFB42B'
+ and jppl.color = 'yellow'
and jp.principal_user_id is not null
and jp.house_code != ''
and jp.id in (
@@ -242,7 +242,7 @@
select jp.*,jppl.poi_code as label from jczz_place jp
left join jczz_place_poi_label jppl on jppl.place_id = jp.id
where jp.is_deleted = 0 and jppl.type = 3
- and jppl.color = '#EA1F1F'
+ and jppl.color = 'red'
and jp.principal_user_id is not null
and jp.house_code != ''
and jp.id in (
@@ -267,7 +267,7 @@
where jp.is_deleted = 0 and jppl.type = 3
and jp.principal_user_id is not null
and jp.house_code != ''
- and (jppl.color = '#30D17C' or jppl.color = '#FFB42B' or jppl.color = '#EA1F1F')
+ and (jppl.color = 'green' or jppl.color = 'yellow' or jppl.color = 'red')
and jp.id not in (
select place_id from ${tableName} where is_deleted = 0 and source = 2 and place_id is not null group by place_id
)
--
Gitblit v1.9.3