From 10e11331cd81f2369f8b8b8722e42573e433c283 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期四, 20 十月 2022 15:20:43 +0800
Subject: [PATCH] 添加消息状态字段查询。
---
ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java | 3 +++
ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java | 4 ++++
ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java | 4 ++++
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 6 ++++++
4 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java b/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
index bb68d68..940858b 100644
--- a/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
+++ b/ycl-common/src/main/java/com/ycl/dto/UmsAdminParam.java
@@ -55,6 +55,10 @@
@ApiModelProperty(value = "搴ф満/鍒嗘満")
private String zj;
+
+ @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+ private Integer isGrid;
+
@NotEmpty
@ApiModelProperty(value = "瑙掕壊Id鍒楄〃", required = true)
private List<Long> roleIds;
diff --git a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
index b40d47a..95e785f 100644
--- a/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
+++ b/ycl-common/src/main/java/com/ycl/entity/user/UmsAdmin.java
@@ -91,6 +91,10 @@
@ApiModelProperty(value = "鎵嬫満鍙风爜")
private String mobile;
+ @ApiModelProperty(value = "鏄惁涓虹綉鏍肩鐞嗗憳锛�0->涓嶆槸锛�1->鏄�")
+ private Integer isGrid;
+
+
@ApiModelProperty(value = "瑙掕壊鍒楄〃")
@TableField(exist = false)
private List<UmsRole> roles;
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index fa538f9..08c5175 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -64,6 +64,12 @@
public IPage<Message> list(MessageParam messageParam) {
Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
LambdaQueryWrapper<Message> queryWrapper = new LambdaQueryWrapper<>();
+ if (messageParam.getMessageType() != null) {
+ queryWrapper.eq(Message::getMessageType, messageParam.getMessageType());
+ }
+ if (messageParam.getStatus() != null) {
+ queryWrapper.eq(Message::getStatus, messageParam.getStatus());
+ }
Page<Message> result = baseMapper.selectPage(page, queryWrapper);
return result;
}
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
index aecf6fd..97d0717 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/SmsAuditServiceImpl.java
@@ -34,6 +34,9 @@
public IPage<SmsAudit> list(SmsAudit smsAudit) {
Page<SmsAudit> page = new Page<>(smsAudit.getCurrent(), smsAudit.getPageSize());
LambdaQueryWrapper<SmsAudit> queryWrapper = new LambdaQueryWrapper<>();
+ if (smsAudit.getAuditId() != null) {
+ queryWrapper.eq(SmsAudit::getAuditId, smsAudit.getAuditId());
+ }
if (smsAudit.getAuditStatus() != null) {
queryWrapper.eq(SmsAudit::getAuditStatus, smsAudit.getAuditStatus());
}
--
Gitblit v1.8.0