Explorar o código

feat: 数据看板增加发件人查询条件

chenjianhua hai 6 meses
pai
achega
df407acc70

+ 13 - 0
service-base/src/main/java/com/simuwang/base/pojo/dto/query/DataboardQuery.java

@@ -11,6 +11,11 @@ public class DataboardQuery {
      * 邮箱地址
      */
     private String email;
+
+    /**
+     * 发送邮箱地址
+     */
+    private String senderEmail;
     /**
      * 邮箱类型
      */
@@ -55,4 +60,12 @@ public class DataboardQuery {
     public void setEndDate(String endDate) {
         this.endDate = endDate;
     }
+
+    public String getSenderEmail() {
+        return senderEmail;
+    }
+
+    public void setSenderEmail(String senderEmail) {
+        this.senderEmail = senderEmail;
+    }
 }

+ 9 - 0
service-base/src/main/resources/mapper/EmailParseInfoMapper.xml

@@ -167,6 +167,9 @@
         <if test="email !=null and email !=''">
             and email like concat('%',#{email},'%')
         </if>
+        <if test="senderEmail !=null and senderEmail !=''">
+            and sender_email like concat('%',#{senderEmail},'%')
+        </if>
         <if test="emailType !=null">
             and email_type = #{emailType}
         </if>
@@ -185,6 +188,9 @@
         <if test="email !=null and email !=''">
             and email like concat('%',#{email},'%')
         </if>
+        <if test="senderEmail !=null and senderEmail !=''">
+            and sender_email like concat('%',#{senderEmail},'%')
+        </if>
         <if test="emailType !=null">
             and email_type = #{emailType}
         </if>
@@ -202,6 +208,9 @@
         <if test="item.email !=null and item.email !=''">
             and email like concat('%',#{item.email},'%')
         </if>
+        <if test="senderEmail !=null and senderEmail !=''">
+            and sender_email like concat('%',#{senderEmail},'%')
+        </if>
         <if test="item.emailType !=null">
             and email_type = #{item.emailType}
         </if>