From 721aed68ee0f2eac9d961e2812cfeeebdc28a9f6 Mon Sep 17 00:00:00 2001 From: elliott <382696293@qq.com> Date: Mon, 11 Dec 2023 13:51:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hzMapper/domain/CtLeaveMessage.java | 44 ++++ .../hzMapper/mapper/CtLeaveMessageMapper.java | 8 + .../mapper/hzMapper/CtLeaveMessageMapper.xml | 32 ++- .../controller/CtLeaveMessageController.java | 3 +- .../service/ICtLeaveMessageService.java | 8 + .../impl/CtLeaveMessageServiceImpl.java | 10 + .../src/views/system/leaveMessage/index.vue | 197 +++++++++--------- 7 files changed, 201 insertions(+), 101 deletions(-) diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/CtLeaveMessage.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/CtLeaveMessage.java index a6aac8c..043251f 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/CtLeaveMessage.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/domain/CtLeaveMessage.java @@ -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.ToStringStyle; +import java.util.Date; + /** * 共创管理-留言管理对象 ct_leave_message * @@ -25,6 +27,9 @@ public class CtLeaveMessage extends BaseEntity /** 来源名称 */ @Excel(name = "来源名称") private String sourceName; + /** 用户编号 */ + @Excel(name = "用户编号") + private Integer userNumber; /** 用户头像 */ @Excel(name = "用户头像") @@ -41,6 +46,13 @@ public class CtLeaveMessage extends BaseEntity /** 用户留言 */ @Excel(name = "用户留言") private String messageInfo; + /** 查询开始时间 */ + private Date beginTime; + /** 查询结束时间 */ + private Date endTime; + + /** 查询电话处理 */ + private String userNumberStr; public void setId(Long id) { @@ -106,6 +118,38 @@ public class CtLeaveMessage extends BaseEntity 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 public String toString() { return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE) diff --git a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java index 9591796..7b34f8e 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java +++ b/flossom-common/flossom-common-hzMapper/src/main/java/com/flossom/hzMapper/mapper/CtLeaveMessageMapper.java @@ -59,4 +59,12 @@ public interface CtLeaveMessageMapper * @return 结果 */ public int deleteCtLeaveMessageByIds(Long[] ids); + + /** + * 查询共创管理-留言管理列表根据对应条件 + * + * @param ctLeaveMessage 共创管理-留言管理 + * @return 共创管理-留言管理集合 + */ + public List selectCtLeaveMessageByCondition(CtLeaveMessage ctLeaveMessage); } diff --git a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/CtLeaveMessageMapper.xml b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/CtLeaveMessageMapper.xml index d7c9b1d..63d45ab 100644 --- a/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/CtLeaveMessageMapper.xml +++ b/flossom-common/flossom-common-hzMapper/src/main/resources/mapper/hzMapper/CtLeaveMessageMapper.xml @@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + @@ -16,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - 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 + + where 1 = 1 + + and + + user_number like concat('%', #{item}, '%') + + + + and + + user_phone like concat('%', #{item}, '%') + + + + and create_time >= #{params.beginTime} + + + and create_time <= #{params.endTime} + + diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java index d9e203b..a1d7ab5 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/controller/CtLeaveMessageController.java @@ -43,7 +43,8 @@ public class CtLeaveMessageController extends BaseController public TableDataInfo list(CtLeaveMessage ctLeaveMessage) { startPage(); - List list = ctLeaveMessageService.selectCtLeaveMessageList(ctLeaveMessage); +// List list = ctLeaveMessageService.selectCtLeaveMessageList(ctLeaveMessage); + List list = ctLeaveMessageService.selectCtLeaveMessageByCondition(ctLeaveMessage); return getDataTable(list); } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ICtLeaveMessageService.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ICtLeaveMessageService.java index 69abdd7..e3319dc 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ICtLeaveMessageService.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/ICtLeaveMessageService.java @@ -59,4 +59,12 @@ public interface ICtLeaveMessageService * @return 结果 */ public int deleteCtLeaveMessageById(Long id); + + /** + * 查询共创管理-留言管理列表-特殊条件 + * + * @param ctLeaveMessage 共创管理-留言管理 + * @return 共创管理-留言管理集合 + */ + public List selectCtLeaveMessageByCondition(CtLeaveMessage ctLeaveMessage); } diff --git a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java index f59daaf..330426d 100644 --- a/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java +++ b/flossom-modules/flossom-system/src/main/java/com/flossom/system/service/impl/CtLeaveMessageServiceImpl.java @@ -93,4 +93,14 @@ public class CtLeaveMessageServiceImpl implements ICtLeaveMessageService { return ctLeaveMessageMapper.deleteCtLeaveMessageById(id); } + /** + * 查询共创管理-留言管理列表-特殊条件 + * + * @param ctLeaveMessage 共创管理-留言管理 + * @return 共创管理-留言管理 + */ + @Override + public List selectCtLeaveMessageByCondition(CtLeaveMessage ctLeaveMessage) { + return ctLeaveMessageMapper.selectCtLeaveMessageByCondition(ctLeaveMessage); + } } diff --git a/flossom-ui/src/views/system/leaveMessage/index.vue b/flossom-ui/src/views/system/leaveMessage/index.vue index a9283cc..7e4d69a 100644 --- a/flossom-ui/src/views/system/leaveMessage/index.vue +++ b/flossom-ui/src/views/system/leaveMessage/index.vue @@ -1,46 +1,33 @@ @@ -133,23 +120,27 @@ - - + + - + - + + - + + + + - - + + - +
@@ -177,6 +168,8 @@ export default { multiple: true, // 显示搜索条件 showSearch: true, + // 日期范围 + dateRange: [], // 总条数 total: 0, // 共创管理-留言管理表格数据 @@ -191,8 +184,10 @@ export default { pageSize: 10, source: null, sourceName: null, + userNumber: null, userImg: null, userName: null, + userNumberStr: null, userPhone: null, messageInfo: null, }, @@ -210,7 +205,7 @@ export default { /** 查询共创管理-留言管理列表 */ getList() { this.loading = true; - listMessage(this.queryParams).then(response => { + listMessage(this.addDateRange(this.queryParams, this.dateRange)).then(response => { this.messageList = response.rows; this.total = response.total; this.loading = false; @@ -228,7 +223,9 @@ export default { source: null, sourceName: null, userImg: null, + userNumber: null, userName: null, + userNumberStr: null, userPhone: null, messageInfo: null, createTime: null @@ -242,6 +239,7 @@ export default { }, /** 重置按钮操作 */ resetQuery() { + this.dateRange = []; this.resetForm("queryForm"); this.handleQuery(); }, @@ -269,23 +267,24 @@ export default { }, /** 提交按钮 */ submitForm() { - this.$refs["form"].validate(valid => { - if (valid) { - if (this.form.id != null) { - updateMessage(this.form).then(response => { - this.$modal.msgSuccess("修改成功"); - this.open = false; - this.getList(); - }); - } else { - addMessage(this.form).then(response => { - this.$modal.msgSuccess("新增成功"); - this.open = false; - this.getList(); - }); - } - } - }); + this.open = false; + // this.$refs["form"].validate(valid => { + // if (valid) { + // if (this.form.id != null) { + // updateMessage(this.form).then(response => { + // this.$modal.msgSuccess("修改成功"); + // this.open = false; + // this.getList(); + // }); + // } else { + // addMessage(this.form).then(response => { + // this.$modal.msgSuccess("新增成功"); + // this.open = false; + // this.getList(); + // }); + // } + // } + // }); }, /** 删除按钮操作 */ handleDelete(row) {