From 2193832ff5b8424d4ed16d0dc7ee779151c0e704 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 15 Apr 2024 11:37:15 +0800
Subject: [PATCH] 轮播图查询议事 bug 修复+ 统战部事件上报类型
---
src/main/java/org/springblade/modules/property/mapper/PropertyCompanyCommentMapper.xml | 8 ++++++++
src/main/java/org/springblade/modules/article/mapper/ArticleCollectMapper.xml | 8 +++++++-
src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java | 2 +-
src/main/java/org/springblade/modules/article/mapper/ArticleBrowseMapper.xml | 9 ++++++++-
src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml | 5 +++--
src/main/java/org/springblade/modules/task/entity/TaskEntity.java | 4 ++--
6 files changed, 29 insertions(+), 7 deletions(-)
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleBrowseMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleBrowseMapper.xml
index d8002c9..cd76676 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleBrowseMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleBrowseMapper.xml
@@ -13,7 +13,14 @@
<select id="selectArticleBrowsePage" resultMap="articleBrowseResultMap">
- select * from jczz_article_browse where is_deleted = 0
+ select * from jczz_article_browse
+ <where>
+ <if test="articleBrowse.id != null "> and id = #{articleBrowse.id}</if>
+ <if test="articleBrowse.articleId != null "> and article_id = #{articleBrowse.articleId}</if>
+ <if test="articleBrowse.createTime != null "> and create_time = #{articleBrowse.createTime}</if>
+ <if test="articleBrowse.createUser != null "> and create_user = #{articleBrowse.createUser}</if>
+ <if test="articleBrowse.isDeleted != null "> and is_deleted = #{articleBrowse.isDeleted}</if>
+ </where>
</select>
diff --git a/src/main/java/org/springblade/modules/article/mapper/ArticleCollectMapper.xml b/src/main/java/org/springblade/modules/article/mapper/ArticleCollectMapper.xml
index bb275da..9e8fe1c 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleCollectMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleCollectMapper.xml
@@ -12,7 +12,13 @@
<select id="selectArticleCollectPage" resultMap="articleCollectResultMap">
- select * from jczz_article_collect where is_deleted = 0
+ select * from jczz_article_collect
+ <where>
+ <if test="noticeCollect.id != null "> and id = #{noticeCollect.id}</if>
+ <if test="noticeCollect.articleId != null "> and article_id = #{noticeCollect.articleId}</if>
+ <if test="noticeCollect.userId != null "> and user_id = #{noticeCollect.userId}</if>
+ <if test="noticeCollect.createTime != null "> and create_time = #{noticeCollect.createTime}</if>
+ </where>
</select>
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 24d2f70..3ea461f 100644
--- a/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
+++ b/src/main/java/org/springblade/modules/article/mapper/ArticleMapper.xml
@@ -552,7 +552,6 @@
<if test="article.eventType != null">
and jpd.event_type = #{article.eventType}
and jpd.end_time is not null
- and jpd.end_time <= SYSDATE()
</if>
<if test="article.propertyFlag!=null ">
@@ -583,7 +582,9 @@
<if test="article.articleType!=null and article.articleType!=''">
and ja.article_type like concat('%',#{article.articleType},'%')
</if>
- <if test="article.type != null ">and ja.type = #{article.type}</if>
+ <if test="article.type != null ">
+ and ja.type = #{article.type}
+ </if>
<if test="article.keyword!=null and article.keyword!=''">
AND CONCAT(ja.title,ja.source_name)
diff --git a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyCommentMapper.xml b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyCommentMapper.xml
index a7128cf..a1346c4 100644
--- a/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyCommentMapper.xml
+++ b/src/main/java/org/springblade/modules/property/mapper/PropertyCompanyCommentMapper.xml
@@ -27,6 +27,10 @@
<if test="propertyCompanyComment.checkStatus!=null">
and jpcc.check_status = #{propertyCompanyComment.checkStatus}
</if>
+
+ <if test="propertyCompanyComment.createUser!=null">
+ and jpcc.create_user = #{propertyCompanyComment.createUser}
+ </if>
</select>
<!--自定义分页查询(递归)-->
@@ -45,6 +49,10 @@
<if test="propertyCompanyComment.checkStatus!=null">
and jpcc.check_status = #{propertyCompanyComment.checkStatus}
</if>
+
+ <if test="propertyCompanyComment.createUser!=null">
+ and jpcc.create_user = #{propertyCompanyComment.createUser}
+ </if>
</select>
<!--递归查询-->
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskEntity.java
index 7bf03d5..060e161 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskEntity.java
@@ -62,8 +62,8 @@
@ApiModelProperty(value = "门牌地址编码")
private String houseCode;
- /** 事件类型（1：取保候审，2旅馆 3打金店 4二手手机 5二手车 6 校园安全） */
- @ApiModelProperty(value = "事件类型（1：取保候审，2.居住证申请 5二手交易 6.无诈 7.消防自查任务 8 九小整改任务 ）", example = "")
+ /** 事件类型（1：取保候审，2.居住证申请 3 统战部事件上报 5二手交易 6.无诈 7.消防自查任务 8 九小整改任务） */
+ @ApiModelProperty(value = "事件类型（1：取保候审，2.居住证申请 3 统战部事件上报 5二手交易 6.无诈 7.消防自查任务 8 九小整改任务 ）", example = "")
@TableField("report_type")
private Integer reportType;
/**
diff --git a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
index 8775ed7..3f035e3 100644
--- a/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
+++ b/src/main/java/org/springblade/modules/task/entity/TaskReportForRepairsEntity.java
@@ -44,7 +44,7 @@
/**
* 类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报,5企业商户上报
*/
- @ApiModelProperty(value = "类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报,5企业商户上报")
+ @ApiModelProperty(value = "类型 1公共维修，2居家维修，3矛盾纠纷，4投诉举报,5企业商户上报 6 统战部事件上报")
private Integer type;
/**
--
Gitblit v1.9.3