diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java index 45f9152909..4c2e07b48d 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/PageTripReportFormDTO.java @@ -54,4 +54,10 @@ public class PageTripReportFormDTO extends PageFormDTO implements Serializable { * 查看详情时此列有值 */ private String id; + + /** + * 7天内旅居史情况,字典表(sojourn_history)【磐石】 + */ + private String sojournHistory; + } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml index b3e00357ac..4a94d37ddc 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml @@ -62,6 +62,9 @@ AND r.id=#{id} + + AND r.sojourn_history = #{sojournHistory} + ORDER BY r.ARRIVE_DATE DESC