From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 193 +++++++++++++++++++++++++++++++----------------
1 files changed, 126 insertions(+), 67 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 f7c1104..c88e9ba 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,45 +60,102 @@
update_time,
update_user,
create_user,
- is_deleted
+ is_deleted,
+ article_range
from
jczz_article
</sql>
<select id="selectArticlePageByApp" resultMap="noticeResultMap">
- select ja.id,
- ja.title,
- ja.type,
- ja.url,
- ja.video_url,
- ja.source_id,
- ja.source_name,
- ja.article_type,
- ja.recommend,
- ja.publish,
- ja.iscomment,
- ja.view_number,
- ja.create_time,
- ja.update_time,
- ja.update_user,
- ja.create_user,
- ja.is_deleted,
- 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 test="article.eventType != null">
+ select ja.id,
+ ja.title,
+ ja.type,
+ ja.url,
+ ja.video_url,
+ ja.source_id,
+ ja.source_name,
+ ja.article_type,
+ ja.recommend,
+ ja.publish,
+ ja.iscomment,
+ ja.view_number,
+ ja.create_time,
+ ja.update_time,
+ ja.update_user,
+ ja.create_user,
+ ja.is_deleted,
+ jpd.id pdId,
+ (select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1722966265111248897' and ja.article_type = bdb.dict_key) dictValue,
+ jpd.event_type
+ from jczz_article ja
+ LEFT JOIN jczz_public_discuss jpd on jpd.article_id=ja.id
+ where ja.is_deleted = 0
+ and ja.publish = 1
+ <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>
+
+ <if test="article.type != null">
+ and ja.type = #{article.type}
+ </if>
+
+ <if test="article.type == null">
+ and ja.type = 0
+ </if>
+
+ <if test="article.districtId != null and article.districtId != ''">
+ and (ja.article_range like concat('%',#{article.districtId},'%')
+ or ja.article_range is null)
+ </if>
+ </if>
+ <!-- 查询文章 -->
+ <if test="article.eventType == null">
+ select ja.id,
+ ja.title,
+ ja.type,
+ ja.url,
+ ja.video_url,
+ ja.source_id,
+ ja.source_name,
+ ja.article_type,
+ ja.recommend,
+ ja.publish,
+ ja.iscomment,
+ ja.view_number,
+ ja.create_time,
+ ja.update_time,
+ ja.update_user,
+ ja.create_user,
+ (select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1722966265111248897' and ja.article_type
+ = bdb.dict_key) dictValue,
+ ja.is_deleted
+ from jczz_article ja
+ where ja.is_deleted = 0
+ and ja.publish = 1
+ <if test="article.articleType != null and article.articleType != ''">
+ and ja.article_type = #{article.articleType}
+ </if>
+
+ <if test="article.type != null">
+ and ja.type = #{article.type}
+ </if>
+
+ <if test="article.type == null">
+ and ja.type = 0
+ </if>
+
+ <if test="article.districtId != null and article.districtId != ''">
+ and (ja.article_range like concat('%',#{article.districtId},'%')
+ or ja.article_range is null)
+ </if>
</if>
- <if test="article.eventType != null">
- and jpd.event_type = #{article.eventType}
- </if>
order by ja.create_time desc
</select>
@@ -139,6 +185,9 @@
AND CONCAT(title,source_name)
LIKE CONCAT ('%', #{article.keyword},'%')
</if>
+ <if test="article.type != null ">and type = #{article.type}</if>
+
+ and is_deleted = 0
order by id desc
</select>
@@ -394,31 +443,41 @@
ja.update_user,
ja.create_user,
ja.is_deleted,
- bdb.dict_value dictValue
- from jczz_article ja LEFT JOIN blade_dict_biz bdb on ja.article_type = bdb.dict_key
+ ja.article_range,
+ ((select bdb.dict_value from blade_dict_biz bdb where bdb.parent_id='1722966265111248897' and ja.article_type
+ = bdb.dict_key)) dictValue
+ from jczz_article ja
<where>
- <if test="id != null "> and ja.id = #{id}</if>
- <if test="title != null and title != ''"> and ja.title = #{title}</if>
- <if test="type != null "> and ja.type = #{type}</if>
- <if test="content != null and content != ''"> and ja.content = #{content}</if>
- <if test="url != null and url != ''"> and ja.url = #{url}</if>
- <if test="videoUrl != null and videoUrl != ''"> and ja.video_url = #{videoUrl}</if>
- <if test="sourceId != null and sourceId != ''"> and ja.source_id = #{sourceId}</if>
- <if test="sourceName != null and sourceName != ''"> and ja.source_name = #{sourceName}</if>
- <if test="articleType != null and articleType != ''"> and ja.article_type = #{articleType}</if>
- <if test="recommend != null "> and ja.recommend = #{recommend}</if>
- <if test="publish != null and publish != ''"> and ja.publish = #{publish}</if>
- <if test="iscomment != null and iscomment != ''"> and ja.iscomment = #{iscomment}</if>
- <if test="viewNumber != null "> and ja.view_number = #{viewNumber}</if>
- <if test="createTime != null "> and ja.create_time = #{createTime}</if>
- <if test="updateTime != null "> and ja.update_time = #{updateTime}</if>
- <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="id != null ">and ja.id = #{id}</if>
+ <if test="title != null and title != ''">and ja.title = #{title}</if>
+ <if test="type != null ">and ja.type = #{type}</if>
+ <if test="content != null and content != ''">and ja.content = #{content}</if>
+ <if test="url != null and url != ''">and ja.url = #{url}</if>
+ <if test="videoUrl != null and videoUrl != ''">and ja.video_url = #{videoUrl}</if>
+ <if test="sourceId != null and sourceId != ''">and ja.source_id = #{sourceId}</if>
+ <if test="sourceName != null and sourceName != ''">and ja.source_name = #{sourceName}</if>
+ <if test="articleType != null and articleType != ''">and ja.article_type = #{articleType}</if>
+ <if test="recommend != null ">and ja.recommend = #{recommend}</if>
+ <if test="publish != null and publish != ''">and ja.publish = #{publish}</if>
+ <if test="iscomment != null and iscomment != ''">and ja.iscomment = #{iscomment}</if>
+ <if test="viewNumber != null ">and ja.view_number = #{viewNumber}</if>
+ <if test="createTime != null ">and ja.create_time = #{createTime}</if>
+ <if test="updateTime != null ">and ja.update_time = #{updateTime}</if>
+ <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
- and bdb.parent_id = '1722966265111248897'
+ and ja.is_deleted = 0
order by ja.create_time desc
</select>
+
+
+ <select id="getDistrictId" resultType="java.lang.String">
+ SELECT jd.id
+ FROM jczz_doorplate_address jda
+ LEFT JOIN jczz_district jd ON jda.aoi_code = jd.aoi_code
+ WHERE jda.address_code = #{houseCode}
+
+ </select>
</mapper>
--
Gitblit v1.9.3