diff --git a/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyDetailMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyDetailMapper.java index f36381b..f628833 100644 --- a/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyDetailMapper.java +++ b/src/main/java/com/gunshi/project/xyt/mapper/TermiteSurveyDetailMapper.java @@ -19,13 +19,13 @@ public interface TermiteSurveyDetailMapper extends BaseMapper - select d.*, s.report_date from termite_survey_detail d left join termite_survey s on d.survey_id = s.id + select d.*, s.report_date,s.create_time from termite_survey_detail d left join termite_survey s on d.survey_id = s.id and s.report_date = #{obj.searchDate} - and d.pile_number = #{obj.pileNumber} + and d.pile_number = #{obj.pileNumber} order by s.report_date desc diff --git a/src/main/java/com/gunshi/project/xyt/model/TermiteSurveyDetail.java b/src/main/java/com/gunshi/project/xyt/model/TermiteSurveyDetail.java index c226bfe..9e507ae 100644 --- a/src/main/java/com/gunshi/project/xyt/model/TermiteSurveyDetail.java +++ b/src/main/java/com/gunshi/project/xyt/model/TermiteSurveyDetail.java @@ -136,4 +136,9 @@ public class TermiteSurveyDetail implements Serializable { @Schema(description = "监测时间") @JsonFormat(pattern = DateFormatString.YYYY_MM_DD, timezone = "GMT+8") private Date reportDate; + + @TableField(exist = false) + @Schema(description = "记录时间") + @JsonFormat(pattern = DateFormatString.YYYY_MM_DD_HH_MM_SS, timezone = "GMT+8") + private Date createTime; } \ No newline at end of file