From 4ec472d8828e34fbcfb3990451d059e486b7d5ea Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 17 Jan 2024 19:32:46 +0800
Subject: [PATCH] 议事管理bug
---
src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml | 34 +++++++++++++++++++++++++---------
1 files changed, 25 insertions(+), 9 deletions(-)
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 13fcf7f..677dbb5 100644
--- a/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
+++ b/src/main/java/org/springblade/modules/place/mapper/PlaceMapper.xml
@@ -8,6 +8,7 @@
<collection property="placePoiLabelVOList" javaType="java.util.List" ofType="org.springblade.modules.place.vo.PlacePoiLabelVO"
autoMapping="true">
<id property="id" column="plid"/>
+ <result property="remark" column="cremark"/>
</collection>
</resultMap>
@@ -65,10 +66,10 @@
and jp.source = #{place.source}
</if>
<if test="place.isPerfect==1">
- and jpe.confirm_flag = 4
+ and jp.status = 1
</if>
<if test="place.isPerfect==2">
- and jpe.confirm_flag >= 1 and jpe.confirm_flag < 4
+ and jp.status = 2
</if>
<if test="place.regionCode != null and place.regionCode !='' ">
and jg.community_code like concat('%',#{place.regionCode},'%')
@@ -121,7 +122,13 @@
select
jp.*,
bu.real_name as username,bu.phone as phone,
- jppl.id as plid,jppl.*,jc.category_name as labelName,
+ jppl.id as plid,
+ jppl.place_id,
+ jppl.poi_code,
+ jppl.type,
+ jppl.color,
+ jppl.remark as cremark,
+ jc.category_name as labelName,
br.code as neiCode,jg.id as gridId
from jczz_place jp
left join blade_user bu on bu.id = jp.principal_user_id and bu.is_deleted = 0
@@ -190,7 +197,9 @@
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 (
select place_id from ${tableName} where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(), create_time )=30
)
@@ -207,10 +216,12 @@
</choose>
union all
(
- select jp.* from jczz_place jp
+ 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 (
select place_id from ${tableName} where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(), create_time )=14
)
@@ -228,10 +239,12 @@
)
union all
(
- select jp.* from jczz_place jp
+ 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 (
select place_id from ${tableName} where is_deleted = 0 and source = 2 and TIMESTAMPDIFF( day, now(), create_time )=7
)
@@ -249,9 +262,12 @@
)
union all
(
- select jp.* from jczz_place jp
+ 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 jp.principal_user_id is not null
+ and jp.house_code != ''
+ 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