From 5a56fe238e5f51efe5221b5a376f109cda4b4b72 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 01 六月 2023 23:29:11 +0800
Subject: [PATCH] Merge branch '1.1' of http://sinata.cn:10101/gitblit/r/java/SuperSaveDriving into 1.1
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml | 58 +++++++++++++++++++++++++++-------------------------------
1 files changed, 27 insertions(+), 31 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml
index 2c882fe..a53f68d 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TComplaintMapper.xml
@@ -6,55 +6,51 @@
<resultMap id="BaseResultMap" type="com.stylefeng.guns.modular.system.model.TComplaint">
<id column="id" property="id" />
<result column="userId" property="userId" />
- <result column="reason" property="reason" />
<result column="driverId" property="driverId" />
- <result column="description" property="description" />
- <result column="isHandle" property="isHandle" />
- <result column="insert_time" property="insertTime" />
- <result column="handleResult" property="handleResult" />
- <result column="handleUserId" property="handleUserId" />
+ <result column="reason" property="reason" />
+ <result column="notes" property="notes" />
+ <result column="state" property="state" />
+ <result column="status" property="status" />
+ <result column="createTime" property="createTime" />
+ <result column="auditId" property="auditId" />
+ <result column="auditPersonName" property="auditPersonName" />
+ <result column="auditTime" property="auditTime" />
</resultMap>
<!-- 通用查询结果列 -->
<sql id="Base_Column_List">
- id, userId, reason, driverId, description, isHandle, insert_time, handleResult, handleUserId
+ id, userId, driverId, reason, notes, state, status, createTime,auditId,auditPersonName,auditTime
</sql>
-
- <!--根据条件查询投诉列表-->
- <select id="getComplaintList" resultType="map" parameterType="com.baomidou.mybatisplus.plugins.Page">
- SELECT * FROM (SELECT di.companyId,di.franchiseeId,ui.nickName as userName,ui.phone as userPhone,di.`name` as driverName,di.phone as driverPhone,si.`name` as handleUserName,cc.* FROM t_complaint as cc
- LEFT JOIN (select * from t_user where flag != 3) as ui on ui.id = cc.userId
- LEFT JOIN (select * from t_driver where flag != 3) as di on di.id = cc.driverId
- LEFT JOIN sys_user as si on si.id = cc.handleUserId
- ) as o
+ <select id="getPageList" resultType="com.stylefeng.guns.modular.system.controller.resp.TComplaintResp">
+ select c.id, c.userId, c.driverId, c.reason, c.notes, c.state, c.status, c.createTime,c.auditId,c.auditPersonName,c.auditTime,
+ au.nickname AS userName,au.phone AS userPhone,d.phone AS driverPhone
+ from t_complaint c
+ left join t_app_user au on c.userId = au.id
+ left join t_driver d on c.driverId = d.id
<where>
- 1 = 1
- <if test="beginTime != null and beginTime != '' and endTime != null and endTime != ''">
- AND (o.insert_time between CONCAT(#{beginTime},' 00:00:00') and CONCAT(#{endTime},' 23:59:59'))
+ <if test="startTime != null and startTime != '' and endTime != null and endTime != ''">
+ AND c.createTime between #{startTime} and #{endTime}
</if>
<if test="userName != null and userName != ''">
- and o.userName LIKE CONCAT('%',#{userName},'%')
+ AND au.nickname LIKE concat('%',#{userName},'%')
</if>
<if test="userPhone != null and userPhone != ''">
- and o.userPhone LIKE CONCAT('%',#{userPhone},'%')
+ AND au.phone LIKE concat('%',#{userPhone},'%')
</if>
<if test="driverPhone != null and driverPhone != ''">
- and o.driverPhone LIKE CONCAT('%',#{driverPhone},'%')
+ AND d.phone LIKE concat('%',#{driverPhone},'%')
</if>
- <if test="isHandle != null and isHandle != '' and isHandle == 2">
- and o.isHandle = 0
+ <if test="state != null">
+ AND c.state = #{state}
</if>
- <if test="isHandle != null and isHandle != '' and isHandle == 1">
- and o.isHandle = 1
+ <if test="roleType != null and roleType == 2">
+ AND d.branchOfficeId = #{objectId}
</if>
- <if test="roleType != null and roleType != '' and roleType == 2">
- and o.companyId = #{nowUserId} and (o.franchiseeId = 0 or o.franchiseeId is null)
- </if>
- <if test="roleType != null and roleType != '' and roleType == 3">
- and o.franchiseeId = #{nowUserId}
+ <if test="roleType != null and roleType == 3">
+ AND d.agentId = #{objectId}
</if>
</where>
- order by o.id desc
+ ORDER BY c.state,c.createTime DESC
</select>
</mapper>
--
Gitblit v1.7.1