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

src/main/java/com/huiju/estateagents/bo/request/ActivityStatisticResponseBO.java

@@ -41,4 +41,9 @@ public class ActivityStatisticResponseBO {
      */
     private Integer newCustomers;
 
+    /**
+     * 活动名称
+     */
+    private String activityName;
+
 }

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

@@ -159,7 +159,7 @@ public class TaPersonController extends BaseController {
             return ResponseBean.error("您已经成为置业顾问",ResponseBean.ERROR_UNAVAILABLE);
         }
         QueryWrapper<TaUser>queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone",person.getPhone());
+        queryWrapper.eq("phone",person.getTel()).or().eq("phone",person.getPhone());
         queryWrapper.eq("org_id",orgId);
         queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
         queryWrapper.eq("is_consultant",true);
@@ -575,7 +575,7 @@ public class TaPersonController extends BaseController {
         }
         if (!StringUtils.isEmpty(phone)){
             person.setTel(phone);
-            person.setPhone(phone);
+//            person.setPhone(phone);
             if(person.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
                 TaUser user = taUserService.getById(person.getUserId());
                 user.setPhone(phone);

src/main/resources/mapper/ActivityManageMapper.xml

@@ -80,7 +80,8 @@
         AND g.`status` > 0
         AND g.is_first_time = 1
         AND h.phone is not null
-        ) as new_customers
+        ) as new_customers,
+        a.activityName
 
         from (
             <if test=" type == 'activity' ">
@@ -90,7 +91,8 @@
                     s.building_name,
                     t.dynamic_id AS target_id,
                     t.title AS target_name,
-                    'activity' AS target_type
+                    'activity' AS target_type,
+                    t.title as activityName
                 FROM
                     ta_building_dynamic t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -106,7 +108,8 @@
                     s.building_name,
                     t.drainage_id AS target_id,
                     t.`name` AS target_name,
-                    'h5' AS target_type
+                    'h5' AS target_type,
+                    t.name as activityName
                 FROM
                   ta_drainage t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -122,7 +125,8 @@
                     s.building_name,
                     t.help_activity_id AS target_id,
                     t.title AS target_name,
-                    'help' AS target_type
+                    'help' AS target_type,
+                    t.title as activityName
                 FROM
                     ta_help_activity t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -138,7 +142,8 @@
                     s.building_name,
                     t.group_activity_id AS target_id,
                     t.activity_name AS target_name,
-                    'group' AS target_type
+                    'group' AS target_type,
+                    t.activity_name as activityName
                 FROM
                     ta_share_activity t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id
@@ -154,7 +159,8 @@
                     s.building_name,
                     t.live_activity_id AS target_id,
                     t.live_activity_title AS target_name,
-                    'live' AS target_type
+                    'live' AS target_type,
+                    t.live_activity_title as activityName
                 FROM
                     ta_live_activity t
                 LEFT JOIN ta_building s ON s.building_id = t.building_id

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

@@ -681,7 +681,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -715,7 +715,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">