From fbfc2679c8fccf7e355562d762da858418f4ddd5 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Fri, 01 Dec 2023 11:40:16 +0800
Subject: [PATCH] 新增居民查询对应物业，网格，公安快捷信息
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
index b423492..4fc94c1 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -23,24 +23,12 @@
<result column="update_user" property="updateUser"/>
<result column="create_user" property="createUser"/>
<result column="is_deleted" property="isDeleted"/>
-
- <!-- <collection property="lickFlag" javaType="int"-->
- <!-- column="id" select="selectStlLick">-->
- <!-- </collection>-->
-
+ <result property="articleRange" column="article_range" />
<collection property="countNumber" column="id" javaType="int" select="selectStlCount">
</collection>
</resultMap>
- <!-- <select id="selectStlLick" parameterType="Long" resultType="int">-->
- <!-- select IFNULL(jnl.id, 0) lickFlag-->
- <!-- FROM jczz_notice jn-->
- <!-- LEFT JOIN jczz_notice_like jnl ON jn.id = jnl.notice_id-->
- <!-- WHERE jnl.notice_user_id = #{notice.userId}-->
- <!-- and jn.is_deleted = 0-->
- <!-- and jn.id = #{id}-->
- <!-- </select>-->
<select id="selectStlCount" resultType="int">
select count(1) countNumber
@@ -50,6 +38,7 @@
and jnl.delete_flag = 0
and jn.id = #{id}
</select>
+
<sql id="selectArticle">
@@ -71,7 +60,8 @@
update_time,
update_user,
create_user,
- is_deleted
+ is_deleted,
+ article_range
from
jczz_article
</sql>
@@ -95,13 +85,19 @@
ja.update_user,
ja.create_user,
ja.is_deleted,
- bdb.dict_value dictValue
+ bdb.dict_value dictValue,
+ jpd.id pdId,
+ jpd.event_type
from jczz_article ja LEFT JOIN blade_dict_biz bdb on ja.article_type = bdb.dict_key
+ LEFT JOIN jczz_public_discuss jpd on jpd.article_id=ja.id
where ja.is_deleted = 0
and ja.publish = 1
and bdb.parent_id = '1722966265111248897'
<if test="article.articleType != null and article.articleType != ''">
and ja.article_type = #{article.articleType}
+ </if>
+ <if test="article.eventType != null">
+ and jpd.event_type = #{article.eventType}
</if>
order by ja.create_time desc
</select>
@@ -132,6 +128,8 @@
AND CONCAT(title,source_name)
LIKE CONCAT ('%', #{article.keyword},'%')
</if>
+
+ and is_deleted = 0
order by id desc
</select>
@@ -387,6 +385,7 @@
ja.update_user,
ja.create_user,
ja.is_deleted,
+ ja.article_range,
bdb.dict_value dictValue
from jczz_article ja LEFT JOIN blade_dict_biz bdb on ja.article_type = bdb.dict_key
<where>
@@ -408,6 +407,7 @@
<if test="updateUser != null "> and ja.update_user = #{updateUser}</if>
<if test="createUser != null "> and ja.create_user = #{createUser}</if>
<if test="isDeleted != null "> and ja.is_deleted = #{isDeleted}</if>
+ <if test="articleRange != null and articleRange != ''"> and article_range = #{articleRange}</if>
</where>
and ja.is_deleted = 0
and ja.publish = 1
--
Gitblit v1.9.3