From 978ef94780746b2e1b816305e023be2ca7fa4b13 Mon Sep 17 00:00:00 2001
From: wany <13995595726@qq.com>
Date: Fri, 18 Oct 2024 11:46:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BD=E8=9A=81=E6=99=AE=E6=9F=A5=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4=EF=BC=8C=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=A5=E8=AF=A2=E6=8C=89=E5=88=9B=E5=BB=BA=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E9=99=8D=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../gunshi/project/xyt/mapper/TermiteSurveyMapper.java    | 2 +-
 .../java/com/gunshi/project/xyt/model/TermiteSurvey.java  | 8 ++++++++
 .../gunshi/project/xyt/service/TermiteSurveyService.java  | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyMapper.java
index 8d50be3..da613a9 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyMapper.java
@@ -39,7 +39,7 @@ public interface TermiteSurveyMapper extends BaseMapper<TermiteSurvey> {
                 and m2.harmNum is null 
             </if>
             </where>
-            order by m1.report_date desc
+            order by m1.report_date desc,m1.create_time desc
                         </script>
                          """)
     Page<TermiteSurvey> pageQuery(Page<TermiteSurvey> page,@Param("obj") TermiteSurveyPageSo page1);
diff --git a/src/main/java/com/gunshi/project/xyt/model/TermiteSurvey.java b/src/main/java/com/gunshi/project/xyt/model/TermiteSurvey.java
index ab01a4f..6ac9e24 100644
--- a/src/main/java/com/gunshi/project/xyt/model/TermiteSurvey.java
+++ b/src/main/java/com/gunshi/project/xyt/model/TermiteSurvey.java
@@ -76,6 +76,14 @@ public class TermiteSurvey implements Serializable {
         @Size(max = 50,message = "上报人最大长度要小于 50")
         private String reportUserName;
 
+        /**
+         * 创建时间
+         */
+        @TableField(value="create_time")
+        @Schema(description="创建时间")
+        @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8")
+        private Date createTime;
+
         @TableField(exist = false)
         @Schema(description = "白蚁危害处数")
         private Integer harmNum = 0;
diff --git a/src/main/java/com/gunshi/project/xyt/service/TermiteSurveyService.java b/src/main/java/com/gunshi/project/xyt/service/TermiteSurveyService.java
index 65e24be..17079ae 100644
--- a/src/main/java/com/gunshi/project/xyt/service/TermiteSurveyService.java
+++ b/src/main/java/com/gunshi/project/xyt/service/TermiteSurveyService.java
@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Date;
 import java.util.Objects;
 
 /**
@@ -27,6 +28,7 @@ public class TermiteSurveyService extends ServiceImpl<TermiteSurveyMapper, Termi
     private TermiteSurveyDetailService detailService;
 
     public TermiteSurvey saveData(TermiteSurvey dto) {
+        dto.setCreateTime(new Date());
         dto.setId(IdWorker.getId());
         boolean result = this.save(dto);
         if (result) {