列表增加查询条件

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;
+
 }

epmet-user/epmet-user-server/src/main/resources/mapper/IcTripReportRecordDao.xml

@@ -62,6 +62,9 @@
             <if test='null != id and "" != id'>
                 AND r.id=#{id}
             </if>
+            <if test='null != sojournHistory and "" != sojournHistory'>
+                AND r.sojourn_history = #{sojournHistory}
+            </if>
         ORDER BY
             r.ARRIVE_DATE DESC
     </select>