* 新需求

src/main/java/com/huiju/estateagents/common/MiniAppPageEnum.java

@@ -11,42 +11,42 @@ public enum MiniAppPageEnum {
     /**
      * 项目
      */
-    PROJECT("project", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/detail/index"),
+    PROJECT("project", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/detail/index"),
 
     /**
      * 报名活动
      */
-    ACTIVITY("activity", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/index"),
+    ACTIVITY("activity", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/index"),
 
     /**
      * 助力活动
      */
-    HELP("help", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assistance"),
+    HELP("help", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assistance"),
 
     /**
      * 拼团活动
      */
-    GROUP("group", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assemble"),
+    GROUP("group", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/activity/detail/assemble"),
 
     /**
      * h5活动
      */
-    H5("h5", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/h5Page"),
+    H5("h5", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/project/h5Page"),
 
     /**
      * 直播活动
      */
-    LIVE("live", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/live/index"),
+    LIVE("live", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/live/index"),
 
     /**
      * 资讯
      */
-    NEWS("news", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/news/detail/index"),
+    NEWS("news", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "pages/news/detail/index"),
 
     /**
      * 在线选房
      */
-    SALESBATCH("salesBatch", "targetId=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/houseList/index");
+    SALESBATCH("salesBatch", "id=%s&targetType=%S&channelId=%s&qrCodeId=%s&buildingId=%s", "onlineSelling/pages/houseList/index");
 
     private String type;
     private String scene;

src/main/java/com/huiju/estateagents/controller/TaQrcodeController.java

@@ -1,26 +1,26 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.gson.JsonObject;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.WxQrCodeUtils;
-import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
-import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.sl.usermodel.Sheet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.List;
 
 /**
@@ -53,14 +53,14 @@ public class TaQrcodeController extends BaseController {
      */
     @RequestMapping(value = "/admin/listQrCode", method = RequestMethod.GET)
     public ResponseBean listQrCodeByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                     String targetType, String targetName, Integer channelId, String buildingId,
-                                     HttpServletRequest request) {
+                                              @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                              String targetType, String targetName, Integer channelId, String buildingId,
+                                              HttpServletRequest request) {
         logger.info("接收参数：targetType：{}，targetName：{}，channelId：{}，buildingId：{}",
                 targetType, targetName, channelId, buildingId);
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum,pageSize,targetType,targetName,channelId,buildingId,getOrgId(request));
+            responseBean = iTaQrcodeService.listQrCodeByCondition(pageNum, pageSize, targetType, targetName, channelId, buildingId, getOrgId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taQrcodeList -=- {}", e.toString());
@@ -116,7 +116,7 @@ public class TaQrcodeController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "/admin/qrCode/batchDelete", method = RequestMethod.DELETE)
-    public ResponseBean batchDelete(List<TaQrcode> taQrcodeList) {
+    public ResponseBean batchDelete(@RequestBody List<TaQrcode> taQrcodeList) {
         ResponseBean responseBean = new ResponseBean();
         try {
 
@@ -184,7 +184,7 @@ public class TaQrcodeController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping("/admin/qrCode/getStatisticData")
+    @RequestMapping(value = "/admin/qrCode/getStatisticData", method = RequestMethod.GET)
     public ResponseBean getStatisticData(Integer qrCodeId, HttpServletRequest request) {
         logger.info("getStatisticData 接收参数：qrCodeId：{}", qrCodeId);
         ResponseBean responseBean = new ResponseBean();
@@ -197,4 +197,50 @@ public class TaQrcodeController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 获取二维码统计信息记录
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param qrCodeId
+     * @param type     1：访问人数，2：访问次数，3：新增注册用户数
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/getStatisticRecord", method = RequestMethod.GET)
+    public ResponseBean getStatisticRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           Integer qrCodeId, Integer type, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaQrcodeService.getStatisticRecord(type, pageNum, pageSize, qrCodeId, getOrgId(request));
+        } catch (Exception e) {
+            logger.error("getStatisticRecord 异常：", e);
+            responseBean.addError("fail");
+        }
+        return responseBean;
+    }
+
+    @RequestMapping(value = "/admin/getStatisticRecordExport", method = RequestMethod.GET)
+    public void getStatisticRecordExport(Integer qrCodeId, Integer type, HttpServletRequest request, HttpServletResponse response) {
+        ExcelWriter writer = null;
+        OutputStream outputStream = null;
+        try {
+            outputStream = response.getOutputStream();
+            iTaQrcodeService.getStatisticRecordExport(type,qrCodeId,getOrgId(request));
+            outputStream.flush();
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            try {
+                response.getOutputStream().close();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
 }
+
+

src/main/java/com/huiju/estateagents/entity/TaPersonVisitRecord.java

@@ -202,4 +202,16 @@ public class TaPersonVisitRecord implements Serializable {
      */
     @TableField(exist = false)
     private String customerId;
+
+    /**
+     * 客户性别
+     */
+    @TableField(exist = false)
+    private Integer sex;
+
+    /**
+     * 客户归属地
+     */
+    @TableField(exist = false)
+    private String city;
 }

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeNewPersonNum.java

@@ -0,0 +1,43 @@
+package com.huiju.estateagents.excel.QrCodeStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class QrCodeNewPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 4)
+    private String visitNum;
+}

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeVisitNum.java

@@ -0,0 +1,45 @@
+package com.huiju.estateagents.excel.QrCodeStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class QrCodeVisitNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问时间", index = 4)
+    private LocalDateTime visitTime;
+}

src/main/java/com/huiju/estateagents/excel/QrCodeStatistics/QrCodeVisitPersonNum.java

@@ -0,0 +1,44 @@
+package com.huiju.estateagents.excel.QrCodeStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class QrCodeVisitPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 4)
+    private String visitNum;
+
+}

src/main/java/com/huiju/estateagents/mapper/TaQrcodeMapper.java

@@ -2,13 +2,18 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * <p>
  * 二维码管理表 Mapper 接口
@@ -29,4 +34,56 @@ public interface TaQrcodeMapper extends BaseMapper<TaQrcode> {
                                           @Param("channelId") Integer channelId,
                                           @Param("buildingId") String buildingId,
                                           @Param("orgId") Integer orgId);
+
+    /**
+     * 获取访问用户人数
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    Integer getVisitPersons(@Param("qrCodeId") Integer qrCodeId,
+                            @Param("orgId") Integer orgId);
+
+    /**
+     * 获取访问次数
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    Integer getVisitNum(@Param("qrCodeId") Integer qrCodeId,
+                        @Param("orgId") Integer orgId);
+
+    /**
+     * 获取新增用户数
+     *
+     * @param qrCodeId
+     * @param orgId
+     * @return
+     */
+    Integer getNewPersons(@Param("qrCodeId") Integer qrCodeId,
+                          @Param("orgId") Integer orgId);
+
+    IPage<TaPersonVisitRecord> getVisitPersonsRecord(IPage<TaPersonVisitRecord> page,
+                                                     @Param("qrCodeId") Integer qrCodeId,
+                                                     @Param("orgId") Integer orgId);
+
+    IPage<TaPersonVisitRecord> getVisitNumRecord(IPage<TaPersonVisitRecord> page,
+                                                 @Param("qrCodeId") Integer qrCodeId,
+                                                 @Param("orgId") Integer orgId);
+
+    IPage<TaPersonVisitRecord> getNewPersonsRecord(IPage<TaPersonVisitRecord> page,
+                                                   @Param("qrCodeId") Integer qrCodeId,
+                                                   @Param("orgId") Integer orgId);
+
+    List<QrCodeVisitPersonNum> getVisitPersonsRecordExport(@Param("qrCodeId") Integer qrCodeId,
+                                                           @Param("orgId") Integer orgId);
+
+
+    List<QrCodeVisitNum> getVisitNumRecordExport(@Param("qrCodeId") Integer qrCodeId,
+                                                 @Param("orgId") Integer orgId);
+
+    List<QrCodeNewPersonNum> getNewPersonsRecordExport(@Param("qrCodeId") Integer qrCodeId,
+                                                       @Param("orgId") Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/ITaQrcodeService.java

@@ -1,6 +1,8 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaQrcode;
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -23,4 +25,7 @@ public interface ITaQrcodeService extends IService<TaQrcode> {
 
     ResponseBean getStatisticData(Integer qrCodeId, Integer orgId);
 
+    ResponseBean getStatisticRecord(Integer type, Integer pageNum, Integer pageSize, Integer qrCodeId, Integer orgId);
+
+    void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId);
 }

src/main/java/com/huiju/estateagents/service/impl/MiniAppServiceImpl.java

@@ -358,9 +358,9 @@ public class MiniAppServiceImpl implements IMiniAppService {
             taQrcode.setCreateDate(LocalDateTime.now());
             taQrcode.setExpireDate(LocalDateTime.now().plusDays(7));
             taQrcode.setQrParams(paramsStr);
-            JSONObject sceneObj = JSONObject.parseObject(scene);
-            if (!StringUtils.isEmpty(sceneObj.getString("qrCodeId"))) {
-                taQrcode.setTargetId(Integer.parseInt(sceneObj.getString("qrCodeId")));
+            if (scene.indexOf("&qrCodeId=") > -1) {
+                String str = scene.substring(scene.indexOf("&qrCodeId=") + 10);
+                taQrcode.setTargetId(Integer.parseInt(str.substring(0, str.indexOf("&"))));
             }
 
             boolean success = taMiniappQrcodeMapper.insert(taQrcode) > 0;

src/main/java/com/huiju/estateagents/service/impl/TaQrcodeServiceImpl.java

@@ -1,27 +1,32 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.excel.EasyExcel;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.WxQrCodeUtils;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TaQrcode;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum;
+import com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.mapper.TaQrcodeMapper;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.service.ITaQrcodeService;
-import org.checkerframework.checker.units.qual.A;
+import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -77,6 +82,19 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
     public ResponseBean saveQrcode(TaQrcode taQrcode, Integer userId, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
+        // 校验是否已有相同的数据
+        QueryWrapper<TaQrcode> qrcodeQueryWrapper = new QueryWrapper<>();
+        qrcodeQueryWrapper.eq("org_id", orgId);
+        qrcodeQueryWrapper.eq(StringUtils.isNotBlank(taQrcode.getBuildingId()), "building_id", taQrcode.getBuildingId());
+        qrcodeQueryWrapper.eq(taQrcode.getChannelId() != null, "channel_id", taQrcode.getChannelId());
+        qrcodeQueryWrapper.eq("target_type", taQrcode.getTargetType());
+        qrcodeQueryWrapper.eq("target_id", taQrcode.getTargetId());
+        TaQrcode taQrCodeCheck = taQrcodeMapper.selectOne(qrcodeQueryWrapper);
+        if (taQrCodeCheck != null) {
+            responseBean.addError("请勿重复提交");
+            return responseBean;
+        }
+
         // 保存数据
         taQrcode.setOrgId(orgId);
         taQrcode.setCreateUser(userId);
@@ -98,7 +116,7 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
         ResponseBean qrCodeResult = iMiniAppService.getQrCode(paramsStr, taMiniapp.getMiniappId());
         if (qrCodeResult != null && ResponseBean.CODE_SUCCESS == qrCodeResult.getCode()) {
             // 更新数据
-            taQrcode.setQrCodeUrl(qrCodeResult.getCode() + "");
+            taQrcode.setQrCodeUrl((String) qrCodeResult.getData());
             if (updateById(taQrcode)) {
                 responseBean.addSuccess(taQrcode);
                 return responseBean;
@@ -127,14 +145,63 @@ public class TaQrcodeServiceImpl extends ServiceImpl<TaQrcodeMapper, TaQrcode> i
             return responseBean;
         }
 
-        // 获取统计数据
-        QrCodeStatisticResponseBO statisticData = taQrcodeMapper.getStatisticData(orgId);
+        // 查询访问总人数
+        Integer visitPersons = taQrcodeMapper.getVisitPersons(qrCodeId, orgId);
+
+        // 查询访问总次数
+        Integer visitNum = taQrcodeMapper.getVisitNum(qrCodeId, orgId);
+
+        // 查询新增用户数
+//        Integer newPersons = taQrcodeMapper.getNewPersons(qrCodeId, orgId);
 
         // 组装反参
         JSONObject resultObj = new JSONObject();
-        resultObj.put("statistic", statisticData);
+        resultObj.put("visitPersons", visitPersons);
+        resultObj.put("visitNum", visitNum);
+//        resultObj.put("newPersons", newPersons);
         resultObj.put("qrCodeInfo", taQrcode);
         responseBean.addSuccess(resultObj);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean getStatisticRecord(Integer type, Integer pageNum, Integer pageSize, Integer qrCodeId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaPersonVisitRecord> pg = new Page<>(pageNum, pageSize);
+        switch (type) {
+            case 1:
+                responseBean.addSuccess(taQrcodeMapper.getVisitPersonsRecord(pg, qrCodeId, orgId));
+                break;
+            case 2:
+                responseBean.addSuccess(taQrcodeMapper.getVisitNumRecord(pg, qrCodeId, orgId));
+                break;
+            case 3:
+                responseBean.addSuccess(taQrcodeMapper.getNewPersonsRecord(pg, qrCodeId, orgId));
+                break;
+            default:
+                responseBean.addError("fail");
+                break;
+        }
+        return responseBean;
+    }
+
+    @Override
+    public void getStatisticRecordExport(Integer type, Integer qrCodeId, Integer orgId) {
+        switch (type) {
+            case 1:
+                List<QrCodeVisitPersonNum> records = taQrcodeMapper.getVisitPersonsRecordExport(qrCodeId,orgId);
+                EasyExcel.write("访问人数.xlsx", QrCodeVisitPersonNum.class).sheet("访问人数").doWrite(records);
+                break;
+            case 2:
+                List<QrCodeVisitNum> records2 = taQrcodeMapper.getVisitNumRecordExport(qrCodeId, orgId);
+                EasyExcel.write("访问次数.xlsx", QrCodeVisitNum.class).sheet("访问次数").doWrite(records2);
+                break;
+            case 3:
+                List<QrCodeNewPersonNum> records3 = taQrcodeMapper.getNewPersonsRecordExport(qrCodeId, orgId);
+                EasyExcel.write("新增注册用户.xlsx", QrCodeNewPersonNum.class).sheet("新增注册用户").doWrite(records3);
+                break;
+            default:
+                break;
+        }
+    }
 }

src/main/resources/mapper/TaQrcodeMapper.xml

@@ -14,23 +14,119 @@
     WHERE
         t.`status` > - 1
         AND t.org_id = #{orgId}
-        <if test = "buildingId == '' or buildingId == null">
+        <if test = "buildingId != '' and buildingId != null">
             AND t.building_id = #{buildingId}
         </if>
-        <if test = "targetType == '' or targetType == null">
+        <if test = "targetType != '' and targetType != null">
             AND t.target_type = #{targetType}
         </if>
-        <if test = "targetName == '' or targetName == null">
+        <if test = "targetName != '' and targetName != null">
             AND t.target_name = #{targetName}
         </if>
-        <if test = "channelId == null">
+        <if test = "channelId != null">
             AND t.channel_id = #{channelId}
         </if>
       ORDER BY
         t.create_date DESC
     </select>
 
-    <select id="getStatisticData" resultType="com.huiju.estateagents.bo.request.QrCodeStatisticResponseBO">
+    <select id="getVisitPersons" resultType="java.lang.Integer">
+        SELECT
+            count( DISTINCT t.person_id )
+        FROM
+            ta_person_visit_record t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qrcode_id = #{qrCodeId}
+    </select>
+
+    <select id="getVisitNum" resultType="java.lang.Integer">
+        SELECT
+            count( * )
+        FROM
+            ta_person_visit_record t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qrcode_id = #{qrCodeId}
+    </select>
+
+    <select id="getNewPersons" resultType="java.lang.Integer">
+
+    </select>
+
+    <select id="getVisitPersonsRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.*,
+            IFNULL(t2.`name`,t2.nickname) userName,
+            t2.tel userTel,
+            t2.sex,
+            t2.city,
+            sum(t.record_id) accessCount
+        FROM
+            ta_person_visit_record t
+            left join ta_person t2
+            on t.person_id = t2.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qrcode_id = #{qrCodeId}
+        GROUP BY
+	        t.person_id
+    </select>
+
+    <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitPersonNum">
+        SELECT
+            IFNULL( t2.`name`, t2.nickname ) nickName,
+            t2.tel phone,
+            t2.sex gender,
+            t2.city province,
+            sum( t.record_id ) visitNum
+        FROM
+            ta_person_visit_record t
+            LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+        WHERE
+            t.org_id = #{orgId}
+
+            AND t.qrcode_id = #{qrCodeId}
+
+        GROUP BY
+            t.person_id
+    </select>
+
+    <select id="getVisitNumRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+        SELECT
+            t.*,
+            IFNULL( t2.`name`, t2.nickname ) userName,
+            t2.tel userTel,
+            t2.sex,
+            t2.city
+        FROM
+            ta_person_visit_record t
+            LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qrcode_id = #{qrCodeId}
+    </select>
+
+    <select id="getVisitPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeVisitNum">
+        SELECT
+            IFNULL( t2.`name`, t2.nickname ) nickName,
+            t2.tel phone,
+            t2.sex gender,
+            t2.city province,
+			t.visit_time visitTime
+        FROM
+            ta_person_visit_record t
+            LEFT JOIN ta_person t2 ON t.person_id = t2.person_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.qrcode_id = #{qrCodeId}
+    </select>
+
+    <select id="getNewPersonsRecord" resultType="com.huiju.estateagents.entity.TaPersonVisitRecord">
+
+    </select>
+
+    <select id="getNewPersonsRecordExport" resultType="com.huiju.estateagents.excel.QrCodeStatistics.QrCodeNewPersonNum">
 
     </select>