From 26e65feaa1671702264888ca59495b6cec88fd21 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 14 二月 2025 15:37:15 +0800
Subject: [PATCH] 报修修改，资讯修改
---
ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml | 3 ++-
ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageQuery.java | 4 ++--
ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml | 4 ++--
ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java | 4 ++++
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
index 10e3f55..eb090cf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInformation.java
@@ -55,6 +55,10 @@
@TableField("release_time")
private LocalDateTime releaseTime;
+ @ApiModelProperty(value = "封面")
+ @TableField("cover")
+ private String cover;
+
@ApiModelProperty(value = "内容")
@TableField("content")
private String content;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageQuery.java
index 3aa2f26..cd0015b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageQuery.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TFaultRepairMessageQuery.java
@@ -10,8 +10,8 @@
@ApiModel(value = "报修列表查询query")
public class TFaultRepairMessageQuery extends BasePage {
- @ApiModelProperty(value = "用户id")
- private String tenantId;
+ @ApiModelProperty(value = "提交人姓名")
+ private String residentName;
@ApiModelProperty(value = "联系电话")
private String contactNumber;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
index 56ca1b4..efeb10c 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TFaultRepairMessageMapper.xml
@@ -111,8 +111,8 @@
LEFT JOIN t_item_type it ON t.item_type_id = it.id
LEFT JOIN t_tenant tnt ON t.tenant_id = tnt.id
<where>
- <if test="query.tenantId != null and query.tenantId != ''">
- AND t.tenant_id = #{query.tenantId}
+ <if test="query.residentName != null and query.residentName != ''">
+ AND tnt.resident_name LIKE CONCAT('%', #{query.residentName}, '%')
</if>
<if test="query.contactNumber != null and query.contactNumber != ''">
AND t.contact_number LIKE CONCAT('%', #{query.contactNumber}, '%')
diff --git a/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
index 12c6526..c8aa23a 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
@@ -9,6 +9,7 @@
<result column="sort_by" property="sortBy" />
<result column="info_source" property="infoSource" />
<result column="release_time" property="releaseTime" />
+ <result column="cover" property="cover" />
<result column="content" property="content" />
<result column="attachment" property="attachment" />
<result column="attachment_name" property="attachmentName" />
@@ -21,7 +22,7 @@
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, title_name, sort_by, info_source, release_time, content, attachment,attachment_name, create_time, update_time, create_by, update_by, disabled
+ id, title_name, sort_by, info_source, release_time,cover, content, attachment,attachment_name, create_time, update_time, create_by, update_by, disabled
</sql>
<select id="pageList" resultType="com.ruoyi.system.model.TInformation">
select
--
Gitblit v1.7.1