From cc174c8f8cd978b499e07d3ae2a37f5672356efd Mon Sep 17 00:00:00 2001
From: "zhenghaiyang@ele-cloud.com" <zhenghaiyang@ele-cloud.com>
Date: Fri, 14 Apr 2023 19:16:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=82=AE=E7=AE=B1=E9=87=87=E9=9B=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/dxhy/core/model/mailGather/MailGatherLogVo.java     | 2 +-
 .../src/main/java/com/dxhy/core/task/SnEmailGatherTask.java | 2 +-
 .../resources/mapper/mailGather/MailGatherLogMapper.xml     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java
index 4cd119b7..5e8a9a96 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/model/mailGather/MailGatherLogVo.java
@@ -16,7 +16,7 @@ public class MailGatherLogVo extends CommonDTO {
     private String subject;
     private String fromAddress;
     private String receiveAddress;
-    private Date sentDate;
+    private String sentDate;
     private String fileType;
     private String fpdm;
     private String fphm;
diff --git a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java
index bafa7e34..4df321d5 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/task/SnEmailGatherTask.java
@@ -127,7 +127,7 @@ public class SnEmailGatherTask {
                 gatherLogVo.setSubject(EmailParseUtils.getSubject(msg));
                 gatherLogVo.setFromAddress(emailName);
                 gatherLogVo.setReceiveAddress(EmailParseUtils.getReceiveAddress(msg, null));
-                gatherLogVo.setSentDate( EmailParseUtils.getSentDate(msg, null));
+                gatherLogVo.setSentDate(EmailParseUtils.getSentDate(msg, null));
                 gatherLogVo.setCreateTime(new Date());
 
                 log.debug("主题: " + EmailParseUtils.getSubject(msg));
diff --git a/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml b/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml
index 659088f5..1c9614e9 100644
--- a/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml
+++ b/dxhy-core/src/main/resources/mapper/mailGather/MailGatherLogMapper.xml
@@ -29,7 +29,7 @@
     <!--查询指定行数据-->
     <select id="queryAllByLimit" resultMap="MailGatherLogMap" parameterType="java.util.Map">
         SELECT
-        m.sent_date, e.dept_name, e.username,  m.from_address, m.file_name, m.file_type, m.ocr_type, m.error_msg
+        m.create_time, e.dept_name, e.username,  m.from_address, m.file_name, m.file_type, m.ocr_type, m.error_msg
         FROM
         mail_gather_log m
         LEFT JOIN email_maintain e ON m.from_address = e.email_address
@@ -50,10 +50,10 @@
                 and m.ocr_type = #{ocrType}
             </if>
             <if test="startTime !=null and startTime != ''">
-                and m.sent_date >= #{startTime}
+                and m.create_time >= #{startTime}
             </if>
             <if test="endTime !=null and endTime != ''">
-                and #{endTime} >= m.sent_date
+                and #{endTime} >= m.create_time
             </if>
         </where>
     </select>