From 433a24418d8507212b036ccc8effdd4f57d20c8e Mon Sep 17 00:00:00 2001
From: 安瑾然 <m17681517455@outlook.com>
Date: 星期二, 21 二月 2023 14:15:34 +0800
Subject: [PATCH] fix:修改mybatis-plus日志打印方式，图片全路径获取函数修改
---
src/main/resources/mapper/ReportDao.xml | 62 ++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/mapper/ReportDao.xml b/src/main/resources/mapper/ReportDao.xml
index 9242398..d3845e6 100644
--- a/src/main/resources/mapper/ReportDao.xml
+++ b/src/main/resources/mapper/ReportDao.xml
@@ -12,20 +12,22 @@
and (u.real_name like '%${reportParamDto.people}%' or u.user_idcard like '%${reportParamDto.people}%')
</if>
<if test="reportParamDto.phoneNumber != ''">
- and u.user_mobile = ${reportParamDto.phoneNumber}
+ and u.user_mobile like '%${reportParamDto.phoneNumber}%'
</if>
<if test="reportParamDto.havaMaterial != ''">
<if test="reportParamDto.havaMaterial == 1">
and r.report_materials is not null
</if>
<if test="reportParamDto.havaMaterial == 0">
- and r.report_materials is null
+ and (r.report_materials is null or r.report_materials='')
</if>
</if>
- <if test="reportParamDto.isInGroup != ''">
- and r.status = ${reportParamDto.isInGroup}
+ <if test="reportParamDto.isInGroup != null">
+ and r.is_in_group = ${reportParamDto.isInGroup}
</if>
+ and r.status = 0
</where>
+ order by r.ctime DESC
</select>
<select id="getReportListVoById" resultType="com.example.jz.modle.vo.ReportListVo">
select u.user_mobile mobile, u.user_idcard idcard, u.real_name reporterName, r.*
@@ -37,16 +39,18 @@
select u.user_mobile mobile,u.user_idcard idcard,u.real_name reporterName,r.*
from report r
join user u on r.user_id = u.id
- join group_user gu on gu.user_id = u.id
<where>
1=1
<if test="reportParamDto.people != ''">
and (u.real_name like '%${reportParamDto.people}%' or u.user_idcard like '%${reportParamDto.people}%')
</if>
<if test="reportParamDto.phoneNumber != ''">
- and u.user_mobile = ${reportParamDto.phoneNumber}
+ and u.user_mobile like '%${reportParamDto.phoneNumber}%'
</if>
- <if test="reportParamDto.havaMaterial != ''">
+ <if test="reportParamDto.isInGroup != null">
+ and r.is_in_group = ${reportParamDto.isInGroup}
+ </if>
+ <if test="reportParamDto.havaMaterial !=null">
<if test="reportParamDto.havaMaterial == 1">
and r.report_materials is not null
</if>
@@ -54,10 +58,48 @@
and r.report_materials is null
</if>
</if>
- <if test="reportParamDto.isInGroup != ''">
- and r.status = ${reportParamDto.isInGroup}
+ </where>
+ and r.cause_id = #{causeId} order by r.ctime DESC limit #{size},#{current}
+ </select>
+
+ <select id="getPageByGroupIdCount" resultType="Integer">
+select count(1) from (
+ select u.user_mobile mobile,u.user_idcard idcard,u.real_name reporterName,r.*
+ from report r
+ join user u on r.user_id = u.id
+ <where>
+ 1=1
+ <if test="reportParamDto.people != ''">
+ and (u.real_name like '%${reportParamDto.people}%' or u.user_idcard like '%${reportParamDto.people}%')
+ </if>
+ <if test="reportParamDto.phoneNumber != ''">
+ and u.user_mobile like '%${reportParamDto.phoneNumber}%'
+ </if>
+ <if test="reportParamDto.isInGroup != null">
+ and r.is_in_group = ${reportParamDto.isInGroup}
+ </if>
+ <if test="reportParamDto.havaMaterial !=null">
+ <if test="reportParamDto.havaMaterial == 1">
+ and r.report_materials is not null
+ </if>
+ <if test="reportParamDto.havaMaterial == 0">
+ and r.report_materials is null
+ </if>
</if>
</where>
- and gu.group_id = #{groupId}
+ and r.cause_id = #{causeId}
+ ) as reporter
</select>
+
+ <select id="selectListGroup" resultType="com.example.jz.modle.entity.Report">
+ SELECT
+ t1.*
+ FROM
+ report t1
+ LEFT JOIN group_user t2 ON t1.id = t2.user_id
+ where t1.user_id=#{id}
+ GROUP BY
+ t2.group_id
+ </select>
+
</mapper>
--
Gitblit v1.8.0