314637581
/
flossom-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

前端优化

Browse Source
master
elliott 2 years ago
parent 2c8bcb98a3
commit 721aed68ee
7 changed files with 201 additions and 101 deletions
Show Stats Download Patch File Download Diff File

44
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/CtLeaveMessage.java
Unescape Escape View File

@ -5,6 +5,8 @@ import com.flossom.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder; import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle; import org.apache.commons.lang3.builder.ToStringStyle;
import java.util.Date;
/** /**
* 共创管理-留言管理对象 ct_leave_message * 共创管理-留言管理对象 ct_leave_message
* *
@ -25,6 +27,9 @@ public class CtLeaveMessage extends BaseEntity
/** 来源名称 */ /** 来源名称 */
@Excel(name = "来源名称") @Excel(name = "来源名称")
private String sourceName; private String sourceName;
/** 用户编号 */
@Excel(name = "用户编号")
private Integer userNumber;
/** 用户头像 */ /** 用户头像 */
@Excel(name = "用户头像") @Excel(name = "用户头像")
@ -41,6 +46,13 @@ public class CtLeaveMessage extends BaseEntity
/** 用户留言 */ /** 用户留言 */
@Excel(name = "用户留言") @Excel(name = "用户留言")
private String messageInfo; private String messageInfo;
/** 查询开始时间 */
private Date beginTime;
/** 查询结束时间 */
private Date endTime;
/** 查询电话处理 */
private String userNumberStr;
public void setId(Long id) public void setId(Long id)
{ {
@ -106,6 +118,38 @@ public class CtLeaveMessage extends BaseEntity
return messageInfo; return messageInfo;
} }
public Integer getUserNumber() {
return userNumber;
}
public void setUserNumber(Integer userNumber) {
this.userNumber = userNumber;
}
public Date getBeginTime() {
return beginTime;
}
public void setBeginTime(Date beginTime) {
this.beginTime = beginTime;
}
public Date getEndTime() {
return endTime;
}
public void setEndTime(Date endTime) {
this.endTime = endTime;
}
public String getUserNumberStr() {
return userNumberStr;
}
public void setUserNumberStr(String userNumberStr) {
this.userNumberStr = userNumberStr;
}
@Override @Override
public String toString() { public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

8
flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java
Unescape Escape View File

@ -59,4 +59,12 @@ public interface CtLeaveMessageMapper
* @return 结果 * @return 结果
*/ */
public int deleteCtLeaveMessageByIds(Long[] ids); public int deleteCtLeaveMessageByIds(Long[] ids);
/**
* 查询共创管理-留言管理列表根据对应条件
*
* @param ctLeaveMessage 共创管理-留言管理
* @return 共创管理-留言管理集合
*/
public List<CtLeaveMessage> selectCtLeaveMessageByCondition(CtLeaveMessage ctLeaveMessage);
} }

32
flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/CtLeaveMessageMapper.xml
Unescape Escape View File

@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="source" column="source" /> <result property="source" column="source" />
<result property="sourceName" column="source_name" /> <result property="sourceName" column="source_name" />
<result property="userImg" column="user_img" /> <result property="userImg" column="user_img" />
<result property="userNumber" column="user_number" />
<result property="userName" column="user_name" /> <result property="userName" column="user_name" />
<result property="userPhone" column="user_phone" /> <result property="userPhone" column="user_phone" />
<result property="messageInfo" column="message_info" /> <result property="messageInfo" column="message_info" />
@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</resultMap> </resultMap>
<sql id="selectCtLeaveMessageVo"> <sql id="selectCtLeaveMessageVo">
select id, source, source_name, user_img, user_name, user_phone, message_info, create_time from ct_leave_message select id, source, source_name, user_img,user_number, user_name, user_phone, message_info, create_time from ct_leave_message
</sql> </sql>
<select id="selectCtLeaveMessageList" parameterType="CtLeaveMessage" resultMap="CtLeaveMessageResult"> <select id="selectCtLeaveMessageList" parameterType="CtLeaveMessage" resultMap="CtLeaveMessageResult">
@ -26,6 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sourceName != null and sourceName != ''"> and source_name like concat('%', #{sourceName}, '%')</if> <if test="sourceName != null and sourceName != ''"> and source_name like concat('%', #{sourceName}, '%')</if>
<if test="userImg != null and userImg != ''"> and user_img = #{userImg}</if> <if test="userImg != null and userImg != ''"> and user_img = #{userImg}</if>
<if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if> <if test="userName != null and userName != ''"> and user_name like concat('%', #{userName}, '%')</if>
<if test="userNumber != null and userNumber != ''"> and user_number like concat('%', #{userNumber}, '%')</if>
<if test="userPhone != null and userPhone != ''"> and user_phone = #{userPhone}</if> <if test="userPhone != null and userPhone != ''"> and user_phone = #{userPhone}</if>
<if test="messageInfo != null and messageInfo != ''"> and message_info = #{messageInfo}</if> <if test="messageInfo != null and messageInfo != ''"> and message_info = #{messageInfo}</if>
</where> </where>
@ -43,6 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sourceName != null">source_name,</if> <if test="sourceName != null">source_name,</if>
<if test="userImg != null">user_img,</if> <if test="userImg != null">user_img,</if>
<if test="userName != null">user_name,</if> <if test="userName != null">user_name,</if>
<if test="userNumber != null">user_number,</if>
<if test="userPhone != null">user_phone,</if> <if test="userPhone != null">user_phone,</if>
<if test="messageInfo != null">message_info,</if> <if test="messageInfo != null">message_info,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
@ -52,6 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sourceName != null">#{sourceName},</if> <if test="sourceName != null">#{sourceName},</if>
<if test="userImg != null">#{userImg},</if> <if test="userImg != null">#{userImg},</if>
<if test="userName != null">#{userName},</if> <if test="userName != null">#{userName},</if>
<if test="userNumber != null">#{userNumber},</if>
<if test="userPhone != null">#{userPhone},</if> <if test="userPhone != null">#{userPhone},</if>
<if test="messageInfo != null">#{messageInfo},</if> <if test="messageInfo != null">#{messageInfo},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
@ -65,6 +69,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="sourceName != null">source_name = #{sourceName},</if> <if test="sourceName != null">source_name = #{sourceName},</if>
<if test="userImg != null">user_img = #{userImg},</if> <if test="userImg != null">user_img = #{userImg},</if>
<if test="userName != null">user_name = #{userName},</if> <if test="userName != null">user_name = #{userName},</if>
<if test="userNumber != null">user_number = #{userNumber},</if>
<if test="userPhone != null">user_phone = #{userPhone},</if> <if test="userPhone != null">user_phone = #{userPhone},</if>
<if test="messageInfo != null">message_info = #{messageInfo},</if> <if test="messageInfo != null">message_info = #{messageInfo},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
@ -82,4 +87,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
#{id} #{id}
</foreach> </foreach>
</delete> </delete>
<select id="selectCtLeaveMessageByCondition" parameterType="CtLeaveMessage" resultMap="CtLeaveMessageResult">
<include refid="selectCtLeaveMessageVo"/>
where 1 = 1
<if test="userNumberStr!=null and userNumberStr !=''">
and
<foreach collection="userNumberStr.split(',')" index="index" item="item" open="(" separator="OR"
close=")">
user_number like concat('%', #{item}, '%')
</foreach>
</if>
<if test="userPhone!=null and userPhone !=''">
and
<foreach collection="userPhone.split(',')" index="index" item="item" open="(" separator="OR"
close=")">
user_phone like concat('%', #{item}, '%')
</foreach>
</if>
<if test="params.beginTime != null and params.beginTime != ''">
and create_time &gt;= #{params.beginTime}
</if>
<if test="params.endTime != null and params.endTime != ''">
and create_time &lt;= #{params.endTime}
</if>
</select>
</mapper> </mapper>

3
flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java
Unescape Escape View File

@ -43,7 +43,8 @@ public class CtLeaveMessageController extends BaseController
public TableDataInfo list(CtLeaveMessage ctLeaveMessage) public TableDataInfo list(CtLeaveMessage ctLeaveMessage)
{ {
startPage(); startPage();
List<CtLeaveMessage> list = ctLeaveMessageService.selectCtLeaveMessageList(ctLeaveMessage); // List<CtLeaveMessage> list = ctLeaveMessageService.selectCtLeaveMessageList(ctLeaveMessage);
List<CtLeaveMessage> list = ctLeaveMessageService.selectCtLeaveMessageByCondition(ctLeaveMessage);
return getDataTable(list); return getDataTable(list);
} }

8
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ICtLeaveMessageService.java
Unescape Escape View File

@ -59,4 +59,12 @@ public interface ICtLeaveMessageService
* @return 结果 * @return 结果
*/ */
public int deleteCtLeaveMessageById(Long id); public int deleteCtLeaveMessageById(Long id);
/**
* 查询共创管理-留言管理列表-特殊条件
*
* @param ctLeaveMessage 共创管理-留言管理
* @return 共创管理-留言管理集合
*/
public List<CtLeaveMessage> selectCtLeaveMessageByCondition(CtLeaveMessage ctLeaveMessage);
} }

10
flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java
Unescape Escape View File

@ -93,4 +93,14 @@ public class CtLeaveMessageServiceImpl implements ICtLeaveMessageService
{ {
return ctLeaveMessageMapper.deleteCtLeaveMessageById(id); return ctLeaveMessageMapper.deleteCtLeaveMessageById(id);
} }
/**
* 查询共创管理-留言管理列表-特殊条件
*
* @param ctLeaveMessage 共创管理-留言管理
* @return 共创管理-留言管理
*/
@Override
public List<CtLeaveMessage> selectCtLeaveMessageByCondition(CtLeaveMessage ctLeaveMessage) {
return ctLeaveMessageMapper.selectCtLeaveMessageByCondition(ctLeaveMessage);
}
} }

197
flossom-ui/src/views/system/leaveMessage/index.vue
Unescape Escape View File

@ -1,46 +1,33 @@
<template> <template>
<div class="app-container"> <div class="app-container">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="来源 1-我的模块 " prop="source"> <el-form-item label="会员编号" prop="userNumberStr">
<el-input <el-input
v-model="queryParams.source" v-model="queryParams.userNumberStr"
placeholder="请输入来源 1-我的模块 " placeholder="搜索多个请用英文逗号,隔开"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="来源名称" prop="sourceName"> <el-form-item label="手机号码" prop="userPhone">
<el-input
v-model="queryParams.sourceName"
placeholder="请输入来源名称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户头像" prop="userImg">
<el-input
v-model="queryParams.userImg"
placeholder="请输入用户头像"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户昵称" prop="userName">
<el-input
v-model="queryParams.userName"
placeholder="请输入用户昵称"
clearable
@keyup.enter.native="handleQuery"
/>
</el-form-item>
<el-form-item label="用户手机号码" prop="userPhone">
<el-input <el-input
v-model="queryParams.userPhone" v-model="queryParams.userPhone"
placeholder="请输入用户手机号码" placeholder="搜索多个请用英文逗号,隔开"
clearable clearable
@keyup.enter.native="handleQuery" @keyup.enter.native="handleQuery"
/> />
</el-form-item> </el-form-item>
<el-form-item label="提交时间">
<el-date-picker
v-model="dateRange"
style="width: 240px"
value-format="yyyy-MM-dd HH:mm"
type="daterange"
range-separator="-"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@ -48,38 +35,38 @@
</el-form> </el-form>
<el-row :gutter="10" class="mb8"> <el-row :gutter="10" class="mb8">
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="primary" <!-- type="primary"-->
plain <!-- plain-->
icon="el-icon-plus" <!-- icon="el-icon-plus"-->
size="mini" <!-- size="mini"-->
@click="handleAdd" <!-- @click="handleAdd"-->
v-hasPermi="['system:leaveMessage:add']" <!-- v-hasPermi="['system:leaveMessage:add']"-->
>新增</el-button> <!-- >新增</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="success" <!-- type="success"-->
plain <!-- plain-->
icon="el-icon-edit" <!-- icon="el-icon-edit"-->
size="mini" <!-- size="mini"-->
:disabled="single" <!-- :disabled="single"-->
@click="handleUpdate" <!-- @click="handleUpdate"-->
v-hasPermi="['system:leaveMessage:edit']" <!-- v-hasPermi="['system:leaveMessage:edit']"-->
>修改</el-button> <!-- >修改</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <!-- <el-col :span="1.5">-->
<el-button <!-- <el-button-->
type="danger" <!-- type="danger"-->
plain <!-- plain-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
size="mini" <!-- size="mini"-->
:disabled="multiple" <!-- :disabled="multiple"-->
@click="handleDelete" <!-- @click="handleDelete"-->
v-hasPermi="['system:leaveMessage:remove']" <!-- v-hasPermi="['system:leaveMessage:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</el-col> <!-- </el-col>-->
<el-col :span="1.5"> <el-col :span="1.5">
<el-button <el-button
type="warning" type="warning"
@ -95,11 +82,11 @@
<el-table v-loading="loading" :data="messageList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="messageList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="主键ID" align="center" prop="id" /> <el-table-column label="序号" align="center" prop="id" />
<el-table-column label="来源 1-我的模块 " align="center" prop="source" /> <el-table-column label="来源" align="center" prop="sourceName" />
<el-table-column label="来源名称" align="center" prop="sourceName" />
<el-table-column label="用户头像" align="center" prop="userImg" /> <el-table-column label="用户头像" align="center" prop="userImg" />
<el-table-column label="用户昵称" align="center" prop="userName" /> <el-table-column label="用户昵称" align="center" prop="userName" />
<el-table-column label="用户编号" align="center" prop="userNumber" />
<el-table-column label="用户手机号码" align="center" prop="userPhone" /> <el-table-column label="用户手机号码" align="center" prop="userPhone" />
<el-table-column label="用户留言" align="center" prop="messageInfo" /> <el-table-column label="用户留言" align="center" prop="messageInfo" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@ -107,17 +94,17 @@
<el-button <el-button
size="mini" size="mini"
type="text" type="text"
icon="el-icon-edit" icon="el-icon-view"
@click="handleUpdate(scope.row)" @click="handleUpdate(scope.row)"
v-hasPermi="['system:leaveMessage:edit']" v-hasPermi="['system:leaveMessage:edit']"
>修改</el-button> >查看</el-button>
<el-button <!-- <el-button-->
size="mini" <!-- size="mini"-->
type="text" <!-- type="text"-->
icon="el-icon-delete" <!-- icon="el-icon-delete"-->
@click="handleDelete(scope.row)" <!-- @click="handleDelete(scope.row)"-->
v-hasPermi="['system:leaveMessage:remove']" <!-- v-hasPermi="['system:leaveMessage:remove']"-->
>删除</el-button> <!-- >删除</el-button>-->
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -133,23 +120,27 @@
<!-- 添加或修改共创管理-留言管理对话框 --> <!-- 添加或修改共创管理-留言管理对话框 -->
<el-dialog :title="title" :visible.sync="open" width="500px" append-to-body> <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
<el-form ref="form" :model="form" :rules="rules" label-width="80px"> <el-form ref="form" :model="form" :rules="rules" label-width="80px">
<el-form-item label="来源 1-我的模块 " prop="source"> <el-form-item label="序号" prop="sourceName">
<el-input v-model="form.source" placeholder="请输入来源 1-我的模块 " /> <el-input v-model="form.id" disabled />
</el-form-item> </el-form-item>
<el-form-item label="来源名称" prop="sourceName"> <el-form-item label="来源名称" prop="sourceName">
<el-input v-model="form.sourceName" placeholder="请输入来源名称" /> <el-input v-model="form.sourceName" disabled />
</el-form-item> </el-form-item>
<el-form-item label="用户头像" prop="userImg"> <el-form-item label="用户头像" prop="userImg">
<el-input v-model="form.userImg" placeholder="请输入用户头像" /> <el-image src="http://110.41.134.131:9300/statics/2023/12/08/blob_20231208144044A002.png"></el-image>
</el-form-item> </el-form-item>
<el-form-item label="用户昵称" prop="userName"> <el-form-item label="用户昵称" prop="userName">
<el-input v-model="form.userName" placeholder="请输入用户昵称" /> <el-input v-model="form.userName" disabled />
</el-form-item>
<el-form-item label="用户编号" prop="userNumber">
<el-input v-model="form.userNumber" disabled />
</el-form-item> </el-form-item>
<el-form-item label="用户手机号码" prop="userPhone"> <el-form-item label="手机号码" prop="userPhone">
<el-input v-model="form.userPhone" placeholder="请输入用户手机号码" /> <el-input v-model="form.userPhone" disabled />
</el-form-item> </el-form-item>
<el-form-item label="用户留言" prop="messageInfo"> <el-form-item label="用户留言" prop="messageInfo">
<el-input v-model="form.messageInfo" type="textarea" placeholder="请输入内容" /> <el-input v-model="form.messageInfo" type="textarea" disabled />
</el-form-item> </el-form-item>
</el-form> </el-form>
<div slot="footer" class="dialog-footer"> <div slot="footer" class="dialog-footer">
@ -177,6 +168,8 @@ export default {
multiple: true, multiple: true,
// 显示搜索条件 // 显示搜索条件
showSearch: true, showSearch: true,
// 日期范围
dateRange: [],
// 总条数 // 总条数
total: 0, total: 0,
// 共创管理-留言管理表格数据 // 共创管理-留言管理表格数据
@ -191,8 +184,10 @@ export default {
pageSize: 10, pageSize: 10,
source: null, source: null,
sourceName: null, sourceName: null,
userNumber: null,
userImg: null, userImg: null,
userName: null, userName: null,
userNumberStr: null,
userPhone: null, userPhone: null,
messageInfo: null, messageInfo: null,
}, },
@ -210,7 +205,7 @@ export default {
/** 查询共创管理-留言管理列表 */ /** 查询共创管理-留言管理列表 */
getList() { getList() {
this.loading = true; this.loading = true;
listMessage(this.queryParams).then(response => { listMessage(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
this.messageList = response.rows; this.messageList = response.rows;
this.total = response.total; this.total = response.total;
this.loading = false; this.loading = false;
@ -228,7 +223,9 @@ export default {
source: null, source: null,
sourceName: null, sourceName: null,
userImg: null, userImg: null,
userNumber: null,
userName: null, userName: null,
userNumberStr: null,
userPhone: null, userPhone: null,
messageInfo: null, messageInfo: null,
createTime: null createTime: null
@ -242,6 +239,7 @@ export default {
}, },
/** 重置按钮操作 */ /** 重置按钮操作 */
resetQuery() { resetQuery() {
this.dateRange = [];
this.resetForm("queryForm"); this.resetForm("queryForm");
this.handleQuery(); this.handleQuery();
}, },
@ -269,23 +267,24 @@ export default {
}, },
/** 提交按钮 */ /** 提交按钮 */
submitForm() { submitForm() {
this.$refs["form"].validate(valid => { this.open = false;
if (valid) { // this.$refs["form"].validate(valid => {
if (this.form.id != null) { // if (valid) {
updateMessage(this.form).then(response => { // if (this.form.id != null) {
this.$modal.msgSuccess("修改成功"); // updateMessage(this.form).then(response => {
this.open = false; // this.$modal.msgSuccess("修改成功");
this.getList(); // this.open = false;
}); // this.getList();
} else { // });
addMessage(this.form).then(response => { // } else {
this.$modal.msgSuccess("新增成功"); // addMessage(this.form).then(response => {
this.open = false; // this.$modal.msgSuccess("新增成功");
this.getList(); // this.open = false;
}); // this.getList();
} // });
} // }
}); // }
// });
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDelete(row) { handleDelete(row) {

Write Preview
Loading…
Cancel
Save