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 { and m2.harmNum is null - order by m1.report_date desc + order by m1.report_date desc,m1.create_time desc """) Page pageQuery(Page 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