Merge remote-tracking branch 'origin/dev' into dev

src/main/java/org/rcisoft/sys/visit/entity/VisitInfoMation.java

@@ -134,10 +134,20 @@ public class VisitInfoMation extends CyIdIncreEntity<VisitInfoMation> {
     private Date visitDateEnd;
 
     /**(0-按按创建时间排序，1-按邀访时间排序，2-按访问日期排序)**/
-    @Transient //访客信息
+    @Transient
     @TableField(exist = false)
     private char sort;
 
+    /**0-未来一周 1-未来三天 2-近三天 3-近一周 4-近一个月**/
+    @Transient
+    @TableField(exist = false)
+    private char selectTime;
+
+    /**0-未到访问时间 1-已过到访时间**/
+    @Transient
+    @TableField(exist = false)
+    private char boolVisit;
+
     @Transient //访客信息
     @TableField(exist = false)
     List<VisitUser> userList;

src/main/resources/mapper/VisitInfomationMapper.xml

@@ -142,6 +142,31 @@
         <if test="entity.visitStatus !=null and entity.visitStatus != ''">
             and vi.visit_status = #{entity.visitStatus}
         </if>
+        <if test="entity.selectTime !=null and entity.selectTime != ''">
+            <if test="entity.selectTime == '0'">
+                and vi.visit_date between current_date and current_date+7
+            </if>
+            <if test="entity.selectTime == '1'">
+                and vi.visit_date between current_date and current_date+3
+            </if>
+            <if test="entity.selectTime == '2'">
+                and vi.visit_date between current_date-3 and current_date
+            </if>
+            <if test="entity.selectTime == '3'">
+                and vi.visit_date between current_date-7 and current_date
+            </if>
+            <if test="entity.selectTime == '4'">
+                and vi.visit_date between current_date-30 and current_date
+            </if>
+        </if>
+        <if test="entity.boolVisit !=null and entity.boolVisit != ''">
+            <if test="entity.boolVisit == '0'">
+                and vi.visit_date >= current_date
+            </if>
+            <if test="entity.boolVisit == '1'">
+                and vi.visit_date &lt;= current_date
+            </if>
+        </if>
         <if test="entity.sort !=null and entity.sort != ''">
             order by
             <if test="entity.sort == '0'">