Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -62,7 +62,7 @@ public class TaLiveActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request));
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request));
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -255,7 +255,7 @@ public class TaLiveActivityController extends BaseController {
             status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, null);
+                    liveActivityTitle, cityId, buildingId, status, null, null);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

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

@@ -32,8 +32,8 @@ import java.util.List;
 
 /**
  * <p>
-    * 置业顾问KPI  前端控制器
-    * </p>
+ * 置业顾问KPI  前端控制器
+ * </p>
  *
  * @author yansen
  * @since 2020-04-14
@@ -49,6 +49,7 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @param startDate
@@ -59,17 +60,16 @@ public class TsConsultantKpiController extends BaseController {
      * @param request
      * @return
      */
-    @RequestMapping(value="/consultant/kpi",method= RequestMethod.GET)
-    public ResponseBean stsConsultantKpiList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                            // startDate 默认格式 YYYYMMDD
-                                            @RequestParam(value ="startDate", required = false) String startDate,
-                                            @RequestParam(value ="endDate", required = false) String endDate,
-                                            @RequestParam(value ="buildingId", required = false) String buildingId,
-                                            @RequestParam(value ="asc", required = false) String asc,
-                                            @RequestParam(value ="desc", required = false) String desc,
-                                            HttpServletRequest request
-        ){
+    @RequestMapping(value = "/consultant/kpi", method = RequestMethod.GET)
+    public ResponseBean stsConsultantKpiList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                             // startDate 默认格式 YYYYMMDD
+                                             @RequestParam(value = "startDate", required = false) String startDate,
+                                             @RequestParam(value = "endDate", required = false) String endDate,
+                                             @RequestParam(value = "buildingId", required = false) String buildingId,
+                                             @RequestParam(value = "asc", required = false) String asc,
+                                             @RequestParam(value = "desc", required = false) String desc,
+                                             HttpServletRequest request) {
         if (null == startDate || "".equals(startDate)) {
             return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
@@ -84,12 +84,12 @@ public class TsConsultantKpiController extends BaseController {
             IPage<TsConsultantKpi> result = iTsConsultantKpiService.stsKPIDaily(pageNum, pageSize, orgId, userId, buildingId, startDate, endDate, StringUtils.humpToLine(asc), StringUtils.humpToLine(desc));
             // 汇总
             TsConsultantKpi total = iTsConsultantKpiService.stsKPITotalByOrg(orgId, userId, buildingId, startDate, endDate);
-            return ResponseBean.success(new HashMap<String, Object>(){{
+            return ResponseBean.success(new HashMap<String, Object>() {{
                 put("paged", result);
                 put("total", total);
             }});
-        }catch (Exception e){
-//            e.printStackTrace();
+        } catch (Exception e) {
+            logger.error("stsConsultantKpiList 异常：", e);
             return ResponseBean.error("查询出错, 请重试 : " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
     }
@@ -97,20 +97,21 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 导出
+     *
      * @param startDate
      * @param endDate
      * @param buildingId
      * @param request
      * @return
      */
-    @RequestMapping(value="/consultant/kpi",method= RequestMethod.POST)
+    @RequestMapping(value = "/consultant/kpi", method = RequestMethod.POST)
     public ResponseBean stsConsultantKpiExport(// startDate 默认格式 YYYYMMDD
-                                            @RequestParam(value ="startDate", required = false) String startDate,
-                                            @RequestParam(value ="endDate", required = false) String endDate,
-                                            @RequestParam(value ="buildingId", required = false) String buildingId,
-                                            HttpServletRequest request,
-                                            HttpServletResponse response
-    ){
+                                               @RequestParam(value = "startDate", required = false) String startDate,
+                                               @RequestParam(value = "endDate", required = false) String endDate,
+                                               @RequestParam(value = "buildingId", required = false) String buildingId,
+                                               HttpServletRequest request,
+                                               HttpServletResponse response
+    ) {
         if (null == startDate || "".equals(startDate)) {
             return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
@@ -125,7 +126,7 @@ public class TsConsultantKpiController extends BaseController {
             // 汇总明细
             List<ConsultantKPIExport> result = iTsConsultantKpiService.stsKPIDailyExport(orgId, userId, buildingId, startDate, endDate);
             ExcelUtils.flush(response, ConsultantKPIExport.class, result, "置业顾问KPI统计" + DateUtils.today());
-        } catch (Exception e){
+        } catch (Exception e) {
 //            e.printStackTrace();
             return ResponseBean.error("导出Excel出错, 请重试 : " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
@@ -142,8 +143,8 @@ public class TsConsultantKpiController extends BaseController {
                 throw new Exception("日期格式必须为YYYYMMDD");
             }
 
-            startTime = DateUtils.day2LocalDateime(startDate.substring(0,4) + "-" + startDate.substring(4, 6) + "-" + startDate.substring(6, 8));
-            endTime = DateUtils.dayToLocalDateime(endDate.substring(0,4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8) + " 23:59:59");
+            startTime = DateUtils.day2LocalDateime(startDate.substring(0, 4) + "-" + startDate.substring(4, 6) + "-" + startDate.substring(6, 8));
+            endTime = DateUtils.dayToLocalDateime(endDate.substring(0, 4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8) + " 23:59:59");
         }
 
         return new LocalDateTime[]{startTime, endTime};
@@ -152,6 +153,7 @@ public class TsConsultantKpiController extends BaseController {
     /**
      * 查询置业的客户
      * startDate 存在则统计新增客户, 不存在则统计所有
+     *
      * @param pageNum
      * @param pageSize
      * @param buildingId
@@ -162,14 +164,14 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/customer")
-    public ResponseBean getConsultantCustomers(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                            @RequestParam(value ="buildingId", required = false) String buildingId,
-                                            @RequestParam(value ="userId") String userId,
-                                            @RequestParam(value ="startDate", required = false) String startDate,
-                                            @RequestParam(value ="endDate", required = false) String endDate,
-                                            HttpServletRequest request
-    ){
+    public ResponseBean getConsultantCustomers(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value = "buildingId", required = false) String buildingId,
+                                               @RequestParam(value = "userId") String userId,
+                                               @RequestParam(value = "startDate", required = false) String startDate,
+                                               @RequestParam(value = "endDate", required = false) String endDate,
+                                               HttpServletRequest request
+    ) {
         LocalDateTime[] dateRange = {null, null};
         try {
             dateRange = getLocalTimeRangeBy(startDate, endDate);
@@ -185,6 +187,7 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 置业分享拓客
+     *
      * @param pageNum
      * @param pageSize
      * @param buildingId
@@ -195,12 +198,12 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/share/customer")
-    public ResponseBean getConsultantShareCustomers(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                    @RequestParam(value ="buildingId", required = false) String buildingId,
-                                                    @RequestParam(value ="userId") String userId,
-                                                    @RequestParam(value ="startDate", required = false) String startDate,
-                                                    @RequestParam(value ="endDate", required = false) String endDate,
+    public ResponseBean getConsultantShareCustomers(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                    @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                    @RequestParam(value = "userId") String userId,
+                                                    @RequestParam(value = "startDate", required = false) String startDate,
+                                                    @RequestParam(value = "endDate", required = false) String endDate,
                                                     HttpServletRequest request) {
 
         LocalDateTime[] dateRange = {null, null};
@@ -218,6 +221,7 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 置业首页访问人数
+     *
      * @param pageNum
      * @param pageSize
      * @param buildingId
@@ -228,12 +232,12 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/homepage/persons")
-    public ResponseBean getConsultantHomePagePersons(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                     @RequestParam(value ="buildingId", required = false) String buildingId,
-                                                     @RequestParam(value ="userId") String userId,
-                                                     @RequestParam(value ="startDate", required = false) String startDate,
-                                                     @RequestParam(value ="endDate", required = false) String endDate,
+    public ResponseBean getConsultantHomePagePersons(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                     @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                     @RequestParam(value = "userId") String userId,
+                                                     @RequestParam(value = "startDate", required = false) String startDate,
+                                                     @RequestParam(value = "endDate", required = false) String endDate,
                                                      HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {
@@ -250,6 +254,7 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 置业首页访问次数
+     *
      * @param pageNum
      * @param pageSize
      * @param buildingId
@@ -260,14 +265,14 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/homepage/times")
-    public ResponseBean getConsultantHomePageTimes(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                     @RequestParam(value ="buildingId", required = false) String buildingId,
-                                                     @RequestParam(value ="userId") String userId,
-                                                     @RequestParam(value ="startDate", required = false) String startDate,
-                                                     @RequestParam(value ="endDate", required = false) String endDate,
-                                                   @RequestParam(value ="personId", required = false) String personId,
-                                                     HttpServletRequest request) {
+    public ResponseBean getConsultantHomePageTimes(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                   @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                   @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                   @RequestParam(value = "userId") String userId,
+                                                   @RequestParam(value = "startDate", required = false) String startDate,
+                                                   @RequestParam(value = "endDate", required = false) String endDate,
+                                                   @RequestParam(value = "personId", required = false) String personId,
+                                                   HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {
             dateRange = getLocalTimeRangeBy(startDate, endDate);
@@ -283,6 +288,7 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 咨询置业次数
+     *
      * @param pageNum
      * @param pageSize
      * @param buildingId
@@ -293,12 +299,12 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/chat/persons")
-    public ResponseBean getConsultantChatPersons(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                 @RequestParam(value ="buildingId", required = false) String buildingId,
-                                                 @RequestParam(value ="userId") String userId,
-                                                 @RequestParam(value ="startDate", required = false) String startDate,
-                                                 @RequestParam(value ="endDate", required = false) String endDate,
+    public ResponseBean getConsultantChatPersons(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                 @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                 @RequestParam(value = "userId") String userId,
+                                                 @RequestParam(value = "startDate", required = false) String startDate,
+                                                 @RequestParam(value = "endDate", required = false) String endDate,
                                                  HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {
@@ -315,6 +321,7 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 点赞详情
+     *
      * @param pageNum
      * @param pageSize
      * @param buildingId
@@ -325,13 +332,13 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/favor")
-    public ResponseBean getConsultantFavor(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                 @RequestParam(value ="buildingId", required = false) String buildingId,
-                                                 @RequestParam(value ="userId") String userId,
-                                                 @RequestParam(value ="startDate", required = false) String startDate,
-                                                 @RequestParam(value ="endDate", required = false) String endDate,
-                                                 HttpServletRequest request) {
+    public ResponseBean getConsultantFavor(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value = "buildingId", required = false) String buildingId,
+                                           @RequestParam(value = "userId") String userId,
+                                           @RequestParam(value = "startDate", required = false) String startDate,
+                                           @RequestParam(value = "endDate", required = false) String endDate,
+                                           HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {
             dateRange = getLocalTimeRangeBy(startDate, endDate);
@@ -347,6 +354,7 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 置业分享次数
+     *
      * @param pageNum
      * @param pageSize
      * @param buildingId
@@ -359,15 +367,15 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/share/targets")
-    public ResponseBean getConsultantShareTargets(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                   @RequestParam(value ="buildingId", required = false) String buildingId,
-                                                   @RequestParam(value ="userId") String userId,
-                                                   @RequestParam(value ="startDate", required = false) String startDate,
-                                                   @RequestParam(value ="endDate", required = false) String endDate,
-                                                  @RequestParam(value ="targetType", required = false) String targetType,
-                                                  @RequestParam(value ="targetName", required = false) String targetName,
-                                                   HttpServletRequest request) {
+    public ResponseBean getConsultantShareTargets(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                  @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                  @RequestParam(value = "userId") String userId,
+                                                  @RequestParam(value = "startDate", required = false) String startDate,
+                                                  @RequestParam(value = "endDate", required = false) String endDate,
+                                                  @RequestParam(value = "targetType", required = false) String targetType,
+                                                  @RequestParam(value = "targetName", required = false) String targetName,
+                                                  HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {
             dateRange = getLocalTimeRangeBy(startDate, endDate);
@@ -383,6 +391,7 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 置业分享访问人数
+     *
      * @param pageNum
      * @param pageSize
      * @param buildingId
@@ -393,12 +402,12 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/share/persons")
-    public ResponseBean getConsultantSharePersons(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                  @RequestParam(value ="buildingId", required = false) String buildingId,
-                                                  @RequestParam(value ="userId") String userId,
-                                                  @RequestParam(value ="startDate", required = false) String startDate,
-                                                  @RequestParam(value ="endDate", required = false) String endDate,
+    public ResponseBean getConsultantSharePersons(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                  @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                  @RequestParam(value = "userId") String userId,
+                                                  @RequestParam(value = "startDate", required = false) String startDate,
+                                                  @RequestParam(value = "endDate", required = false) String endDate,
                                                   HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {
@@ -415,6 +424,7 @@ public class TsConsultantKpiController extends BaseController {
 
     /**
      * 置业分享访问次数
+     *
      * @param pageNum
      * @param pageSize
      * @param buildingId
@@ -427,16 +437,16 @@ public class TsConsultantKpiController extends BaseController {
      * @return
      */
     @GetMapping("/consultant/share/times")
-    public ResponseBean getConsultantShareTimes(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                                @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                                @RequestParam(value ="buildingId", required = false) String buildingId,
-                                                @RequestParam(value ="userId") String userId,
-                                                @RequestParam(value ="startDate", required = false) String startDate,
-                                                @RequestParam(value ="endDate", required = false) String endDate,
-                                                @RequestParam(value ="targetType", required = false) String targetType,
-                                                @RequestParam(value ="targetName", required = false) String targetName,
-                                                @RequestParam(value ="userName", required = false) String userName,
-                                                @RequestParam(value ="personId", required = false) String personId,
+    public ResponseBean getConsultantShareTimes(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @RequestParam(value = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "userId") String userId,
+                                                @RequestParam(value = "startDate", required = false) String startDate,
+                                                @RequestParam(value = "endDate", required = false) String endDate,
+                                                @RequestParam(value = "targetType", required = false) String targetType,
+                                                @RequestParam(value = "targetName", required = false) String targetName,
+                                                @RequestParam(value = "userName", required = false) String userName,
+                                                @RequestParam(value = "personId", required = false) String personId,
                                                 HttpServletRequest request) {
         LocalDateTime[] dateRange = {null, null};
         try {

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

@@ -30,7 +30,7 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
      */
     Boolean addVisitNum(@Param("id") String id);
 
-    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("userId") Integer userId);
     /**
      * 批量更新直播活动状态
      *

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

@@ -41,7 +41,7 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @return
      */
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
+                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId);
 
     /**
      * 访问量自增

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

@@ -104,13 +104,13 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
 
     @Override
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId) {
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
                     "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
                 liveActivityTitle, cityId, buildingId, status);
 
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId);
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId, userId);
     }
 
     @Override

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

@@ -46,7 +46,7 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
      * @return List 长度 0 代表未授权楼盘, null 代表管理员, 不校验楼盘授权
      */
     public List<String> getBuildingListOf(Integer userId, String buildingId) {
-        List<String> unAuthrized = new ArrayList<String>(){{
+        List<String> unAuthrized = new ArrayList<String>() {{
             add("*");   // 构造SQL  building_id in ('*') , 目的是为了阻止检索到数据
         }};
 
@@ -55,9 +55,9 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
             return unAuthrized;
         }
 
-        if (taUser.getIsAdmin()) {
+        if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
             if (!StringUtils.isEmpty(buildingId)) {
-                return new ArrayList<String>(){{
+                return new ArrayList<String>() {{
                     add(buildingId);
                 }};
             }
@@ -74,14 +74,14 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
             desc = "new_persons";
         }
 
-        List<String> buildingIds =  getBuildingListOf(userId, buildingId);
+        List<String> buildingIds = getBuildingListOf(userId, buildingId);
         IPage<TsConsultantKpi> page = new Page<>(pageNum, pageSize);
         return tsConsultantKpiMapper.stsKPIDaily(page, orgId, buildingIds, startDate, endDate, asc, desc);
     }
 
     @Override
     public TsConsultantKpi stsKPITotalByOrg(Integer orgId, Integer userId, String buildingId, String startDate, String endDate) {
-        List<String> buildingIds =  getBuildingListOf(userId, buildingId);
+        List<String> buildingIds = getBuildingListOf(userId, buildingId);
 
         // 合计数据, 但是不包含 客户总计 列
         TsConsultantKpi result = tsConsultantKpiMapper.stsKPITotalByOrg(orgId, buildingIds, startDate, endDate);
@@ -95,7 +95,7 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
 
     @Override
     public List<ConsultantKPIExport> stsKPIDailyExport(Integer orgId, Integer userId, String buildingId, String startDate, String endDate) {
-        List<String> buildingIds =  getBuildingListOf(userId, buildingId);
+        List<String> buildingIds = getBuildingListOf(userId, buildingId);
         return tsConsultantKpiMapper.stsKPIDailyExport(orgId, buildingIds, startDate, endDate);
     }
 

src/main/java/com/huiju/estateagents/statistic/controller/ActivityStatisticController.java

@@ -244,8 +244,9 @@ public class ActivityStatisticController extends BaseController {
                                                @RequestParam(value = "activityId", required = false)String activityId,
                                                @RequestParam(value = "activityType", required = false)String activityType,
                                                @RequestParam(value = "buildingId", required = false)String buildingId,
+                                               @RequestParam(value = "province", required = false)String province,
                                                HttpServletRequest request) {
-        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
+        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, province, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**
@@ -259,6 +260,7 @@ public class ActivityStatisticController extends BaseController {
                                                                @RequestParam(value = "activityId", required = false)String activityId,
                                                                @RequestParam(value = "activityType", required = false)String activityType,
                                                                @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                               @RequestParam(value = "province", required = false)String province,
                                                                HttpServletRequest request, HttpServletResponse response) throws IOException {
         response.setContentType("application/octet-stream");
         response.setCharacterEncoding("utf-8");
@@ -266,7 +268,7 @@ public class ActivityStatisticController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
+        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, province, getTaPersonBuildingListByUserId(request), getUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

src/main/java/com/huiju/estateagents/statistic/mapper/TaActicityStaticMapper.java

@@ -196,6 +196,7 @@ public interface TaActicityStaticMapper {
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
             @Param("buildingId") String buildingId,
+            @Param("province") String province,
             @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
             @Param("userId") Integer userId
     );
@@ -208,6 +209,7 @@ public interface TaActicityStaticMapper {
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
             @Param("buildingId") String buildingId,
+            @Param("province") String province,
             @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
             @Param("userId") Integer userId
     );

src/main/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java

@@ -141,14 +141,14 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey, taPersonBuildings, userId);
     }
 
-    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, String province, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         IPage<AddRegistNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
+        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
         return ResponseBean.success(data);
     }
 
-    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
-        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
+    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, String province, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
     }
 
     public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -40,10 +40,11 @@
          and t.building_id = #{buildingId}
     </if>
     <if test="personBuildingList != null and personBuildingList.size > 0">
-        AND t.building_id in
+        AND (t.building_id in
         <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
             #{personBuilding.buildingId}
         </foreach>
+        or t.create_user = #{userId})
     </if>
         order by t.weight desc
     </select>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -438,7 +438,7 @@
         FROM
         ta_person_visit_record tp
         where tp.org_id = #{orgId} AND
-        tp.event  = 'start'
+        tp.event  = 'index'
         AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
     </select>
 

src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

@@ -170,7 +170,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -248,7 +248,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -326,7 +326,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -376,7 +376,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -425,7 +425,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -481,7 +481,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -694,7 +694,7 @@
         sequence a
         <trim prefix="where">
             <if test="startDate != null or endDate != null">
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
             </if>
         </trim>
         ) AS temp_date
@@ -912,7 +912,7 @@
             and a.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and a.title = #{activityName}
+            and a.title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and a.building_id in
@@ -927,7 +927,7 @@
             and b.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and b.title = #{activityName}
+            and b.title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and b.building_id in
@@ -943,7 +943,7 @@
             and c.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and c.activity_name = #{activityName}
+            and c.activity_name like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and c.building_id in
@@ -958,13 +958,15 @@
             and d.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and d.name = #{activityName}
+            and d.name like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            and c.building_id in
+            and (d.building_id in
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or d.create_user = #{userId}
+            )
         </if>
         union all
         select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
@@ -974,13 +976,15 @@
             and e.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and e.live_activity_title = #{activityName}
+            and e.live_activity_title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            and e.building_id in
+            and (e.building_id in
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or e.create_user = #{userId}
+            )
         </if>
         ) as activity
 
@@ -990,7 +994,8 @@
             'activity', 'group','h5','help','liveApp','livePost')
             and a.org_id = #{orgId}
             <if test="targetType != null and targetType != ''">
-                and a.tagert_type = #{targetType}
+                and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
+                end)
             </if>
             <if test="startDate != null ">
                 and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1001,7 +1006,7 @@
             <if test="startDate == null or endDate == null ">
                 AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
             </if>
-            group by a.be_share
+            group by a.be_share,a.tagert_type
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
@@ -1010,7 +1015,8 @@
         From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="targetType != null and targetType != ''">
-            and a.tagert_type = #{targetType}
+            and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
+            end)
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1027,10 +1033,10 @@
         activity.activityType
 
         left join (
-            select count(*) as visitNum, a.target_id, case when a.target_type = 'dynamic' then 'activity' else a.target_type end as target_type
+            select count(*) as visitNum, a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as target_type
             From ta_person_visit_record a where a.event_type in
             ('activity','group','h5','help') and a.`event` = 'detail' and a.org_id = #{orgId}
-            <if test="targetType != null and targetType != ''">
+            <if test="targetType != null and targetType != '' and targetType != 'h5'">
                 and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
                 end)
             </if>
@@ -1043,14 +1049,14 @@
             <if test="startDate == null or endDate == null ">
                 AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
             </if>
-            group by a.target_id, a.event_type
+            group by a.target_id, a.target_type
         ) as visitNum on visitNum.target_id = activity.activityId and visitNum.target_type = activity.activityType
 
         left join (
-            SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dynamic' then 'activity' else a.target_type end as event_type
+            SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as event_type
             From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` =
             'detail' and a.org_id = #{orgId}
-            <if test="targetType != null and targetType != ''">
+            <if test="targetType != null and targetType != '' and targetType != 'h5'">
                 and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
                 end)
             </if>
@@ -1063,7 +1069,7 @@
             <if test="startDate == null or endDate == null ">
                 AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
             </if>
-            group by a.target_id, a.event_type
+            group by a.target_id, a.target_type
         ) as visitPersonNum on visitPersonNum.target_id = activity.activityId and visitPersonNum.event_type =
         activity.activityType
 
@@ -1073,7 +1079,7 @@
         'help_share', 'live_share', 'group_share' ) and a.org_id = #{orgId}
         and a.status = 1
         and a.is_first_time = 1
-        <if test="targetType != null and targetType != ''">
+        <if test="targetType != null and targetType != '' and targetType != 'h5'">
             and a.target_type = #{targetType}
         </if>
         <if test="startDate != null ">
@@ -1104,13 +1110,7 @@
     <select id="selectActivityStatisDetailExport"
             resultType="com.huiju.estateagents.excel.ActivityStatistics.ActivityDetailShareRecord">
         select
-        activity.activityId, activity.activityName,
-        case when activity.activityType = 'activity' then '报名活动'
-        when activity.activityType = 'help' then '助力活动'
-        when activity.activityType = 'group' then '拼团活动'
-        when activity.activityType = 'h5' then 'H5活动'
-        when activity.activityType = 'live' then '直播活动'
-        end as activityType,
+        activity.*,
         ifnull(shareNum.shareNum, 0) as shareNum,
         ifnull(sharePersonNum.sharePersonNum, 0) as sharePersonNum,
         ifnull(visitNum.visitNum, 0) as visitNum,
@@ -1173,10 +1173,12 @@
             and d.name = #{activityName}
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            and c.building_id in
+            and (d.building_id in
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or d.create_user = #{userId}
+            )
         </if>
         union all
         select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
@@ -1189,10 +1191,12 @@
             and e.live_activity_title = #{activityName}
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
-            and e.building_id in
+            and (e.building_id in
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or e.create_user = #{userId}
+            )
         </if>
         ) as activity
 
@@ -1201,28 +1205,34 @@
         FROM ta_share_count a where a.tagert_type in (
         'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
+        <if test="targetType != null and targetType != ''">
+            and a.tagert_type = #{targetType}
+        </if>
         <if test="startDate != null ">
-            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.be_share
+        group by a.be_share,a.tagert_type
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
-        select count(*) as sharePersonNum ,sharePersonNum.be_share, sharePersonNum.tagert_type,
-        sharePersonNum.create_date from (
-        SELECT a.be_share, a.create_date ,case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end   as tagert_type From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
+        SELECT count(*) as sharePersonNum ,sharePersonNum.be_share, sharePersonNum.tagert_type, sharePersonNum.create_date from (
+        SELECT a.be_share, a.create_date ,case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end   as tagert_type
+        From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
+        <if test="targetType != null and targetType != ''">
+            and a.tagert_type = #{targetType}
+        </if>
         <if test="startDate != null ">
-            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -1233,37 +1243,43 @@
         activity.activityType
 
         left join (
-        select * from (
-        select count(*) as visitNum, a.target_id, a.event_type From ta_person_visit_record a where a.event_type in
+        select count(*) as visitNum, a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as target_type
+        From ta_person_visit_record a where a.event_type in
         ('activity','group','h5','help') and a.`event` = 'detail' and a.org_id = #{orgId}
+        <if test="targetType != null and targetType != '' and targetType != 'h5'">
+            and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+            end)
+        </if>
         <if test="startDate != null">
-            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.target_id, a.event_type
-        ) as a
-        ) as visitNum on visitNum.target_id = activity.activityId and visitNum.event_type = activity.activityType
+        group by a.target_id, a.target_type
+        ) as visitNum on visitNum.target_id = activity.activityId and visitNum.target_type = activity.activityType
 
         left join (
-        select count(*) as visitPersonNum ,visitPersonNum.target_id, visitPersonNum.event_type from (
-        select a.* From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` =
+        SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as event_type
+        From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` =
         'detail' and a.org_id = #{orgId}
+        <if test="targetType != null and targetType != '' and targetType != 'h5'">
+            and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+            end)
+        </if>
         <if test="startDate != null">
-            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.person_id, a.target_id, a.event_type
-        ) as visitPersonNum group by visitPersonNum.target_id, visitPersonNum.event_type
+        group by a.target_id, a.target_type
         ) as visitPersonNum on visitPersonNum.target_id = activity.activityId and visitPersonNum.event_type =
         activity.activityType
 
@@ -1273,11 +1289,14 @@
         'help_share', 'live_share', 'group_share' ) and a.org_id = #{orgId}
         and a.status = 1
         and a.is_first_time = 1
+        <if test="targetType != null and targetType != '' and targetType != 'h5'">
+            and a.target_type = #{targetType}
+        </if>
         <if test="startDate != null ">
-            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -1294,7 +1313,7 @@
             order by sharePersonNum.create_date desc
         </if>
         <if test="colKey != null and colKey != ''">
-            ORDER BY ${colKey} ${sort}
+            ORDER BY ${colKey} ${sortType}
         </if>
     </select>
 
@@ -1405,7 +1424,7 @@
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
-        and t.org_id = #{orgId} group by t.share_person ) t
+        and t.org_id = #{orgId} ) t
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitNum on visitNum.person_id = person.person_id
@@ -1429,6 +1448,7 @@
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
+        group by person.person_id
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
         </if>
@@ -1544,7 +1564,7 @@
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
-        and t.org_id = #{orgId} group by t.share_person ) t
+        and t.org_id = #{orgId} ) t
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitNum on visitNum.person_id = person.person_id
@@ -1568,6 +1588,7 @@
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
+        group by person.person_id
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
         </if>
@@ -1645,12 +1666,17 @@
         </if>
         ) as person
         LEFT JOIN (
-        SELECT count(*) as visitPersonNum, ifnull(a.person_id,b.person_id) as person_id
+        SELECT count(DISTINCT(t.person_id)) as visitPersonNum, ifnull(a.person_id,b.person_id) as person_id
         FROM ta_share_person_from t
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
-        where t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
-        #{orgId}
+        where t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId}
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.target_type = concat(#{activityType}, '_share')
+        </if>
         <if test="personId != null and personId != ''">
             and t.share_person = #{personId}
         </if>
@@ -1739,12 +1765,17 @@
         </if>
         ) as person
         LEFT JOIN (
-        SELECT count(*) as visitPersonNum, ifnull(a.person_id,b.person_id) as person_id
+        SELECT count(DISTINCT(t.person_id)) as visitPersonNum, ifnull(a.person_id,b.person_id) as person_id
         FROM ta_share_person_from t
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
-        where t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
-        #{orgId}
+        where t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId}
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.target_type = concat(#{activityType}, '_share')
+        </if>
         <if test="personId != null and personId != ''">
             and t.share_person = #{personId}
         </if>
@@ -1763,14 +1794,14 @@
         a.nickname, a.phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
-        b1.scene_name as personFrom,
+        b1.scene_alias as personFrom,
         GROUP_CONCAT(c.name) as realtyConsultant,
         ifnull(d.phone, d.tel) as realtyConsultantPhone,
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, e.tel) as sharePersonPhone
         FROM ta_share_person_from t
         left join ta_person a on t.person_id = a.person_id
-        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = 84 and b.is_first_time =1
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         left join ta_recommend_customer c on c.person_id = t.person_id
         left join ta_person d on c.recommend_person = d.person_id
@@ -1787,6 +1818,9 @@
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(#{activityType}, '_share')
         </if>
+        <if test="province != null and province != ''">
+            and a.province like concat('%', #{province}, '%')
+        </if>
         <if test="personFrom != null and personFrom != ''">
             and b.scene_type = #{personFrom}
         </if>
@@ -1802,14 +1836,14 @@
         a.nickname, a.phone,
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
-        b1.scene_name as personFrom,
+        b1.scene_alias as personFrom,
         GROUP_CONCAT(c.name) as realtyConsultant,
         ifnull(d.phone, d.tel) as realtyConsultantPhone,
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, e.tel) as sharePersonPhone
         FROM ta_share_person_from t
         left join ta_person a on t.person_id = a.person_id
-        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = 84 and b.is_first_time =1
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         left join ta_recommend_customer c on c.person_id = t.person_id
         left join ta_person d on c.recommend_person = d.person_id
@@ -1826,6 +1860,9 @@
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(#{activityType}, '_share')
         </if>
+        <if test="province != null and province != ''">
+            and a.province like concat('%', #{province}, '%')
+        </if>
         <if test="personFrom != null and personFrom != ''">
             and b.scene_type = #{personFrom}
         </if>
@@ -1863,7 +1900,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
@@ -1925,7 +1962,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
@@ -1993,7 +2030,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
@@ -2060,7 +2097,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
@@ -2140,8 +2177,8 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        d.user_name as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone
@@ -2225,8 +2262,8 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        d.user_name as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone