1

src/main/java/com/fdkankan/agent/controller/ContactUsController.java

@@ -1,6 +1,7 @@
 package com.fdkankan.agent.controller;
 
 
+import com.fdkankan.agent.common.PageInfo;
 import com.fdkankan.agent.common.RequestBase;
 import com.fdkankan.agent.common.ResultData;
 import com.fdkankan.agent.request.ContactUsParam;
@@ -27,9 +28,9 @@ public class ContactUsController {
     IContactUsService contactUsService;
 
     @PostMapping("/list")
-    public ResultData pageList(@RequestBody RequestBase requestBase){
+    public ResultData pageList(@RequestBody ContactUsParam param){
 
-        return ResultData.ok(contactUsService.pageList(requestBase));
+        return ResultData.ok(PageInfo.PageInfo(contactUsService.pageList(param)));
     }
 
     @GetMapping("/export")
@@ -41,7 +42,7 @@ public class ContactUsController {
     @PostMapping("/pointList")
     public ResultData pointList(@RequestBody ContactUsParam param){
 
-        return ResultData.ok(contactUsService.pointPageList(param));
+        return ResultData.ok(PageInfo.PageInfo(contactUsService.pointPageList(param)));
     }
 
     @GetMapping("/exportPoint")

src/main/java/com/fdkankan/agent/mapper/IContactUsPointMapper.java

@@ -1,7 +1,9 @@
 package com.fdkankan.agent.mapper;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.entity.ContactUsPoint;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.agent.request.ContactUsParam;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface IContactUsPointMapper extends BaseMapper<ContactUsPoint> {
 
+    Page<ContactUsPoint> pageList(Page<Object> objectPage, ContactUsParam param);
 }

src/main/java/com/fdkankan/agent/request/ContactUsParam.java

@@ -8,11 +8,15 @@ import java.util.List;
 
 @Data
 public class ContactUsParam extends RequestBase {
+    private String email;
     private String utmSource;
     private List<String> timeList;
+    private List<String> visitTimeList;
 
     private String startTime;
     private String endTime;
+    private String visitStartTime;
+    private String visitEndTime;
 
     public String getStartTime() {
         if(timeList != null && timeList.size() >1){
@@ -27,4 +31,18 @@ public class ContactUsParam extends RequestBase {
         }
         return DateUtils.getEndTime(endTime);
     }
+
+    public String getVisitStartTime() {
+        if(visitTimeList != null && visitTimeList.size() >1){
+            return DateUtils.getStartTime(visitTimeList.get(0));
+        }
+        return DateUtils.getStartTime(visitStartTime);
+    }
+
+    public String getVisitEndTime() {
+        if(visitTimeList != null && visitTimeList.size() >1){
+            return DateUtils.getEndTime(visitTimeList.get(1));
+        }
+        return DateUtils.getEndTime(visitEndTime);
+    }
 }

src/main/java/com/fdkankan/agent/service/IContactUsPointService.java

@@ -1,7 +1,9 @@
 package com.fdkankan.agent.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.entity.ContactUsPoint;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.agent.request.ContactUsParam;
 
 /**
  * <p>
@@ -13,4 +15,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface IContactUsPointService extends IService<ContactUsPoint> {
 
+    Page<ContactUsPoint> pageList(Page<Object> objectPage, ContactUsParam param);
 }

src/main/java/com/fdkankan/agent/service/IContactUsService.java

@@ -1,8 +1,11 @@
 package com.fdkankan.agent.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.agent.common.PageInfo;
 import com.fdkankan.agent.common.RequestBase;
 import com.fdkankan.agent.entity.ContactUs;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.agent.entity.ContactUsPoint;
 import com.fdkankan.agent.request.ContactUsParam;
 
 import javax.servlet.http.HttpServletRequest;
@@ -18,11 +21,11 @@ import javax.servlet.http.HttpServletResponse;
  */
 public interface IContactUsService extends IService<ContactUs> {
 
-    Object pageList(RequestBase requestBase);
+    Page<ContactUs> pageList(ContactUsParam param);
 
     void export(HttpServletRequest req, HttpServletResponse resp, String lang);
 
-    Object pointPageList(ContactUsParam param);
+    Page<ContactUsPoint> pointPageList(ContactUsParam param);
 
     void exportPoint(HttpServletRequest req, HttpServletResponse resp, String lang);
 }

src/main/java/com/fdkankan/agent/service/impl/ContactUsPointServiceImpl.java

@@ -1,7 +1,9 @@
 package com.fdkankan.agent.service.impl;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.agent.entity.ContactUsPoint;
 import com.fdkankan.agent.mapper.IContactUsPointMapper;
+import com.fdkankan.agent.request.ContactUsParam;
 import com.fdkankan.agent.service.IContactUsPointService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
@@ -17,4 +19,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class ContactUsPointServiceImpl extends ServiceImpl<IContactUsPointMapper, ContactUsPoint> implements IContactUsPointService {
 
+    @Override
+    public Page<ContactUsPoint> pageList(Page<Object> objectPage, ContactUsParam param) {
+        return this.getBaseMapper().pageList(objectPage,param);
+    }
 }

src/main/java/com/fdkankan/agent/service/impl/ContactUsServiceImpl.java

@@ -42,18 +42,31 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
     @Autowired
     IContactUsPointService contactUsPointService;
 
+    static ContactUsParam contactUsParam;
+    static ContactUsParam contactUsParam2;
 
     @Override
-    public Object pageList(RequestBase requestBase) {
+    public  Page<ContactUs> pageList(ContactUsParam param) {
+        contactUsParam = param;
         LambdaQueryWrapper<ContactUs> wrapper = new LambdaQueryWrapper<>();
+        if(StringUtils.isNotBlank(param.getEmail())){
+            wrapper.like(ContactUs::getEmail,param.getEmail());
+        }
+        if(StringUtils.isNotBlank(param.getStartTime()) && StringUtils.isNotBlank(param.getEndTime())){
+            wrapper.between(ContactUs::getCreateTime,param.getStartTime(),param.getEndTime());
+            wrapper.ge(ContactUs::getCreateTime,param.getStartTime());
+        }
         wrapper.orderByDesc(ContactUs::getId);
-        Page<ContactUs> page = this.page(new Page<>(requestBase.getPageNum(), requestBase.getPageSize()),wrapper);
-        return PageInfo.PageInfo(page);
+        Page<ContactUs> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()),wrapper);
+        return page;
     }
 
     @Override
     public void export(HttpServletRequest req, HttpServletResponse resp, String lang) {
-        List<ContactUs> list = this.list();
+        contactUsParam.setPageNum(1);
+        contactUsParam.setPageSize(999999);
+        Page<ContactUs> pageInfo = this.pageList(contactUsParam);
+        List<ContactUs> list = pageInfo.getRecords();
         ExcelWriter excelWriter = null;
         try {
             if("en".equals(lang)){
@@ -86,24 +99,18 @@ public class ContactUsServiceImpl extends ServiceImpl<IContactUsMapper, ContactU
 
 
     @Override
-    public Object pointPageList(ContactUsParam param) {
-        LambdaQueryWrapper<ContactUsPoint> wrapper = new LambdaQueryWrapper<>();
-        if(StringUtils.isNotBlank(param.getUtmSource())){
-            wrapper.like(ContactUsPoint::getUtmSource,param.getUtmSource());
-        }
-        if(StringUtils.isNotBlank(param.getStartTime())){
-            wrapper.ge(ContactUsPoint::getCreateTime,param.getStartTime());
-        }
-        if(StringUtils.isNotBlank(param.getEndTime())){
-            wrapper.le(ContactUsPoint::getCreateTime,param.getEndTime());
-        }
-        Page<ContactUsPoint> page = contactUsPointService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
-        return PageInfo.PageInfo(page);
+    public Page<ContactUsPoint> pointPageList(ContactUsParam param) {
+        contactUsParam2 = param;
+        Page<ContactUsPoint> page = contactUsPointService.pageList(new Page<>(param.getPageNum(), param.getPageSize()), param);
+        return page;
     }
 
     @Override
     public void exportPoint(HttpServletRequest req, HttpServletResponse resp, String lang) {
-        List<ContactUsPoint> list = contactUsPointService.list();
+        contactUsParam2.setPageNum(1);
+        contactUsParam2.setPageSize(999999);
+        Page<ContactUsPoint> pageInfo = this.pointPageList(contactUsParam2);
+        List<ContactUsPoint> list = pageInfo.getRecords();
         ExcelWriter excelWriter = null;
         try {
             if("en".equals(lang)){

src/main/resources/mapper/agent/ContactUsPointMapper.xml

@@ -2,4 +2,25 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fdkankan.agent.mapper.IContactUsPointMapper">
 
+    <select id="pageList" resultType="com.fdkankan.agent.entity.ContactUsPoint">
+        select * from t_contact_us_point p left join  t_contact_us u on p.session_id = u.session_id
+        where p.rec_status = 'A'
+        <if test="param.email != null and param.email != ''">
+           and u.email like  concat('%',#{param.email},'%')
+        </if>
+
+        <if test="param.utmSource != null and param.utmSource != ''">
+            and u.utm_source like  concat('%',#{param.utmSource},'%')
+        </if>
+
+        <if test="param.startTime != null and param.endTime != ''">
+            and p.create_time BETWEEN #{param.startTime} and #{param.endTime}
+        </if>
+
+        <if test="param.visitStartTime != null and param.visitEndTime != ''">
+            and u.create_time BETWEEN #{param.visitStartTime} and #{param.visitEndTime}
+        </if>
+        order by p.id desc
+    </select>
+
 </mapper>