修改点击量时间搜索

src/main/java/org/rcisoft/business/memInfo/dao/MemInfoRepository.java

@@ -2,6 +2,7 @@ package org.rcisoft.business.memInfo.dao;
 
 import org.rcisoft.business.cmsActivity.entity.CmsActivity;
 import org.rcisoft.business.memInfo.entity.*;
+import org.rcisoft.business.memTraffic.entity.MemTraffic;
 import org.rcisoft.core.mapper.CyBaseMapper;
 import org.apache.ibatis.annotations.ResultMap;
 import org.apache.ibatis.annotations.Select;
@@ -95,6 +96,8 @@ public interface MemInfoRepository extends CyBaseMapper<MemInfo> {
 
     List<CmsActivity> getCmsActivityList(@Param("entity") peopleNumberDTO peopleNumberDTO);
 
+    List<MemTraffic> getVisitCountList(@Param("entity") peopleNumberDTO peopleNumberDTO);
+
     List<opmArticleDTO> getArticleCountByDateRangeYes(@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 
     List<opmArticleDTO> getArticleCountByMonthRangeYes(@Param("startDateMonth")LocalDate startDateMonth,@Param("endDate") LocalDate endDate);

src/main/java/org/rcisoft/business/memInfo/entity/peopleNumberDTO.java

 package org.rcisoft.business.memInfo.entity;
 
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import org.rcisoft.business.cmsActivity.entity.CmsActivity;
+import org.rcisoft.business.memTraffic.entity.MemTraffic;
 
 import java.util.List;
 
@@ -42,6 +45,16 @@ public class peopleNumberDTO {
      */
     private String lastDay;
 
+    /**
+     * 开始时间
+     */
+    private String beginTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+
     /*
      * 活动列表
      */
@@ -50,5 +63,5 @@ public class peopleNumberDTO {
      *访问次数
      */
 
-    List<CmsActivity> visitCount;
+    List<MemTraffic> visitCount;
 }
\ No newline at end of file

src/main/java/org/rcisoft/business/memInfo/service/impl/MemInfoServiceImpl.java

@@ -450,7 +450,7 @@ public class MemInfoServiceImpl extends ServiceImpl<MemInfoRepository,MemInfo>
         list.setRealNumber(baseMapper.getRealNumber(peopleNumberDTO));
         list.setRegisterNumber(baseMapper.getRegisterNumber(peopleNumberDTO));
         list.setCmsActivityList(baseMapper.getCmsActivityList(peopleNumberDTO));
-        list.setVisitCount(baseMapper.getCmsActivityList(peopleNumberDTO));
+        list.setVisitCount(baseMapper.getVisitCountList(peopleNumberDTO));
 
         return list;
     }

src/main/java/org/rcisoft/business/memLeaveMessage/entity/MemLeaveMessage.java

@@ -94,6 +94,20 @@ public class MemLeaveMessage extends CyIdIncreNotDataEntity<MemLeaveMessage> {
      @TableField(exist = false)
      private String isPay;
 
+     /**
+      * 结束时间
+      */
+     @JsonIgnore
+     @TableField(exist = false)
+     private String endTime;
+
+     /**
+      * 开始时间
+      */
+     @JsonIgnore
+     @TableField(exist = false)
+     private String beginTime;
+
      /**
       * 会员wxOpenid
       */

src/main/resources/mapper/business/memInfo/mapper/MemInfoMapper.xml

@@ -651,4 +651,19 @@
            OR (oulm.create_by = #{entity.targetId} and oulm.target_id = #{entity.userId})
         ORDER BY create_date desc
     </select>
+    <select id="getVisitCountList" resultType="org.rcisoft.business.memTraffic.entity.MemTraffic">
+        select * ,
+        su.nick_name as nickName
+        from mem_traffic mt
+        left join sys_user su on mt.user_id = su.business_id
+        where 1=1
+        <if test="entity.beginTime !=null and entity.beginTime != '' ">
+            and mt.create_date &gt;= #{entity.beginTime}
+        </if>
+        <if test="entity.endTime !=null and entity.endTime != '' ">
+            and mt.create_date &lt; date_add(#{entity.endTime}, INTERVAL 1 DAY)
+        </if>
+        ORDER BY mem_traffic desc
+        limit 10
+    </select>
 </mapper>