From c852afe12717340e80c3f408eb6874e808586aee Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Sun, 07 Apr 2024 09:18:29 +0800
Subject: [PATCH] 短信代码优化
---
src/main/java/org/springblade/modules/sms/entity/SmsTemplateEntity.java | 15 +++++++++++++++
src/main/java/org/springblade/modules/sms/mapper/SmsTemplateMapper.xml | 11 ++++++++++-
src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java | 2 +-
src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.xml | 14 +++++++++++++-
4 files changed, 39 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
index f19cc30..adb701b 100644
--- a/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
+++ b/src/main/java/org/springblade/modules/doorplateAddress/service/impl/DoorplateAddressServiceImpl.java
@@ -225,7 +225,7 @@
list.add(houseNode);
TreeStringNode placeNode = new TreeStringNode();
- placeNode.setName("场所");
+ placeNode.setName("经营场所");
placeNode.setId("2");
placeNode.setHasChildren(true);
placeNode.setChildren(placeNodeList);
diff --git a/src/main/java/org/springblade/modules/sms/entity/SmsTemplateEntity.java b/src/main/java/org/springblade/modules/sms/entity/SmsTemplateEntity.java
index 3f9b01c..88d4a52 100644
--- a/src/main/java/org/springblade/modules/sms/entity/SmsTemplateEntity.java
+++ b/src/main/java/org/springblade/modules/sms/entity/SmsTemplateEntity.java
@@ -97,4 +97,19 @@
@ApiModelProperty(value = "1:否 2：是", example = "")
@TableField("status")
private String status;
+
+ /**
+ * 标题
+ */
+ @ApiModelProperty(value = "标题", example = "")
+ @TableField("title")
+ private String title;
+
+
+ /**
+ * 备注
+ */
+ @ApiModelProperty(value = "备注", example = "")
+ @TableField("remark")
+ private String remark;
}
diff --git a/src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.xml b/src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.xml
index a726cca..31de588 100644
--- a/src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.xml
+++ b/src/main/java/org/springblade/modules/sms/mapper/SmsRecordMapper.xml
@@ -8,7 +8,19 @@
<select id="selectSmsRecordPage" resultMap="smsRecordResultMap">
- select * from blade_sms_record where is_deleted = 0
+ select * from blade_sms_record
+ <where>
+ <if test="smsRecord.id != null ">and id = #{smsRecord.id}</if>
+ <if test="smsRecord.templateId != null ">and template_id = #{smsRecord.templateId}</if>
+ <if test="smsRecord.phone != null and smsRecord.phone != ''">and phone like concat('%',#{smsRecord.phone},'%') </if>
+ <if test="smsRecord.content != null and smsRecord.content != ''">and content like concat('%',#{smsRecord.content},'%') </if>
+ <if test="smsRecord.createUser != null ">and create_user = #{smsRecord.createUser}</if>
+ <if test="smsRecord.createDept != null ">and create_dept = #{smsRecord.createDept}</if>
+ <if test="smsRecord.createTime != null ">and create_time = #{smsRecord.createTime}</if>
+ <if test="smsRecord.updateTime != null ">and update_time = #{smsRecord.updateTime}</if>
+ <if test="smsRecord.status != null ">and status = #{smsRecord.status}</if>
+ <if test="smsRecord.isDeleted != null ">and is_deleted = #{smsRecord.isDeleted}</if>
+ </where>
</select>
<resultMap type="org.springblade.modules.sms.dto.SmsRecordDTO" id="BladeSmsRecordDTOResult">
diff --git a/src/main/java/org/springblade/modules/sms/mapper/SmsTemplateMapper.xml b/src/main/java/org/springblade/modules/sms/mapper/SmsTemplateMapper.xml
index b8a0949..beafbbf 100644
--- a/src/main/java/org/springblade/modules/sms/mapper/SmsTemplateMapper.xml
+++ b/src/main/java/org/springblade/modules/sms/mapper/SmsTemplateMapper.xml
@@ -8,7 +8,16 @@
<select id="selectSmsTemplatePage" resultMap="smsTemplateResultMap">
- select * from blade_sms_template where is_deleted = 0
+ select * from blade_sms_template
+ <where>
+ <if test="smsTemplate.id != null "> and id = #{smsTemplate.id}</if>
+ <if test="smsTemplate.deptId != null "> and dept_id = #{smsTemplate.deptId}</if>
+ <if test="smsTemplate.content != null and smsTemplate.content != ''"> and content like concat('%', #{smsTemplate.content},'%')</if>
+ <if test="smsTemplate.createTime != null "> and create_time = #{smsTemplate.createTime}</if>
+ <if test="smsTemplate.updateTime != null "> and update_time = #{smsTemplate.updateTime}</if>
+ <if test="smsTemplate.createBy != null "> and create_by = #{smsTemplate.createBy}</if>
+ <if test="smsTemplate.isDeleted != null and smsTemplate.isDeleted != ''"> and is_deleted = #{smsTemplate.isDeleted}</if>
+ </where>
</select>
--
Gitblit v1.9.3