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

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

         if (null != taBuilding) {
             customerFrom.setBuildingId(buildingId);
             customerFrom.setBuildingName(taBuilding.getBuildingName());
-            customerFrom.setIsProjectFirst(true);
+            QueryWrapper<TaCustomerFrom> queryWrapper = new QueryWrapper<TaCustomerFrom>();
+            queryWrapper.eq("person_id", person.getPersonId());
+            queryWrapper.eq("org_id", orgId);
+            queryWrapper.eq("building_id", buildingId);
+            if (taCustomerFromMapper.selectList(queryWrapper).size() < 1){
+                customerFrom.setIsProjectFirst(true);
+            }
 
             for (TaRecommendCustomer cust : customers) {
                 if (buildingId.equals(cust.getBuildingId())) {

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

                 customerFrom.setOrgId(taRecommendCustomer.getOrgId());
 //              customerFrom.setSceneId(sceneId);
                 customerFrom.setIsOrgFirst(orgFirst);
-                customerFrom.setIsProjectFirst(true);
+                QueryWrapper<TaCustomerFrom> queryWrapper = new QueryWrapper<TaCustomerFrom>();
+                queryWrapper.eq("person_id", taRecommendCustomer.getPersonId());
+                queryWrapper.eq("org_id", taRecommendCustomer.getOrgId());
+                queryWrapper.eq("building_id", taRecommendCustomer.getBuildingId());
+                if (taCustomerFromMapper.selectList(queryWrapper).size() < 1){
+                    customerFrom.setIsProjectFirst(true);
+                }
                 customerFrom.setCreateDate(LocalDateTime.now());
                 customerFrom.setBuildingId(taRecommendCustomer.getBuildingId());
                 customerFrom.setBuildingName(taBuilding.getBuildingName());

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

         t.create_date AS create_date,
         t.person_id
         FROM
-        ta_share_person_from t
+        ta_customer_from t
         WHERE
-        t.target_type IN ( 'dynamic_share', 'h5_share', 'help_share', 'live_share', 'group_share' )
+        t.target_type IN ( 'dynamic', 'h5', 'help', 'live', 'group', 'activity' )
         AND t.org_id = #{orgId}
-        AND t.STATUS = 1
-        and t.is_first_time = 1
+        and t.is_org_first = 1
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
         t.create_date AS create_date,
         t.person_id
         FROM
-        ta_share_person_from t
+        ta_customer_from t
         WHERE
-        t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId}
+        t.target_type in ('dynamic','h5','help','live', 'group', 'activity') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
-        and t.status = 1
-        and t.is_first_time = 1
+        and t.is_org_first = 1
         <if test="targetType != null and targetType != ''">
             and t.target_type = #{targetType}
         </if>
         t.create_date AS create_date,
         t.person_id
         FROM
-        ta_share_person_from t
+        ta_customer_from t
         WHERE
-        t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId}
+        t.target_type in ('dynamic','h5','help','live', 'group', 'activity') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
-        and t.status = 1
-        and t.is_first_time = 1
+        and t.is_org_first = 1
         <if test="targetType != null and targetType != ''">
             and t.target_type = #{targetType}
         </if>
 
         left join (
         select count(*) as addRegistNum ,addRegistNum.target_id, addRegistNum.target_type From (
-        select count(*), a.* From ta_share_person_from a where a.target_type IN ( 'dynamic_share', 'h5_share',
-        'help_share', 'live_share', 'group_share' ) and a.org_id = #{orgId}
-        and a.status = 1
-        and a.is_first_time = 1
+        select count(*), a.* From ta_customer_from a where a.target_type IN ( 'dynamic', 'h5',
+        'help', 'live', 'group', 'activity' ) and a.org_id = #{orgId}
+        and a.is_org_first = 1
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
-            and a.target_type = concat(REPLACE(#{targetType}, 'activity', 'dynamic'), '_share')
+            and a.target_type = #{targetType}
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         group by a.person_id, a.target_type ,a.target_id
         ) as addRegistNum group by addRegistNum.target_type, addRegistNum.target_id
-        ) as addRegistNum on addRegistNum.target_id = activity.activityId and activity.activityType  = substring_index(REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity_share') , '_share', 1)
+        ) as addRegistNum on addRegistNum.target_id = activity.activityId and activity.activityType  = addRegistNum.target_type
         <if test="targetType != null and targetType != ''">
             where activity.activityType = #{targetType}
         </if>
 
         left join (
         select count(*) as addRegistNum ,addRegistNum.target_id, addRegistNum.target_type From (
-        select count(*), a.* From ta_share_person_from a where a.target_type IN ( 'dynamic_share', 'h5_share',
-        'help_share', 'live_share', 'group_share' ) and a.org_id = #{orgId}
-        and a.status = 1
-        and a.is_first_time = 1
+        select count(*), a.* From ta_customer_from a where a.target_type IN ( 'dynamic', 'h5',
+        'help', 'live', 'group', 'activity') and a.org_id = #{orgId}
+        and a.is_org_first = 1
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
             and a.target_type = concat(REPLACE(#{targetType}, 'activity', 'dynamic'), '_share')
         </if>
         </if>
         group by a.person_id, a.target_type ,a.target_id
         ) as addRegistNum group by addRegistNum.target_type, addRegistNum.target_id
-        ) as addRegistNum on addRegistNum.target_id = activity.activityId and activity.activityType  = substring_index(REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity_share') , '_share', 1)
+        ) as addRegistNum on addRegistNum.target_id = activity.activityId and activity.activityType  = addRegistNum.target_type
         <if test="targetType != null and targetType != ''">
             where activity.activityType = #{targetType}
         </if>
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        GROUP_CONCAT(d.user_name) as realtyConsultant,
-        group_concat(d.phone) as realtyConsultantPhone,
-        ifnull(e.nickname, f.name) as sharePersonName,
-        ifnull(e.phone, f.phone) as sharePersonPhone
-        FROM ta_share_person_from t
+        d.user_name as realtyConsultant,
+        d.phone as realtyConsultantPhone,
+        e.nickname  AS sharePersonName,
+        e.phone AS sharePersonPhone
+        FROM ta_customer_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 = #{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_user d ON c.realty_consultant = d.user_id
-        LEFT JOIN ta_person e ON t.share_person = e.person_id
-        LEFT JOIN ta_person f ON t.share_person = f.user_id
-        WHERE t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
-        #{orgId} and t.status = 1
-        and t.is_first_time = 1
+        LEFT JOIN ta_person e ON t.share_person_id = e.person_id
+        WHERE t.target_type in ('dynamic','h5','help','live', 'group','activity') and t.org_id =
+        #{orgId}
+        and t.is_org_first = 1
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},
         '%Y-%m-%d' )
         <if test="activityId != null and activityId != ''">
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = #{activityType}
         </if>
         <if test="province != null and province != ''">
             and a.province like concat('%', #{province}, '%')
         b1.scene_alias as personFrom,
         GROUP_CONCAT(d.user_name) as realtyConsultant,
         group_concat(d.phone) as realtyConsultantPhone,
-        ifnull(e.nickname, f.name) as sharePersonName,
-        ifnull(e.phone, f.phone) as sharePersonPhone
-        FROM ta_share_person_from t
+        e.nickname  AS sharePersonName,
+        e.phone AS sharePersonPhone
+        FROM ta_customer_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 = #{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_user d ON c.realty_consultant = d.user_id
-        LEFT JOIN ta_person e ON t.share_person = e.person_id
-        LEFT JOIN ta_person f ON t.share_person = f.user_id
-        WHERE t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
-        #{orgId} and t.status = 1
-        and t.is_first_time = 1
+        LEFT JOIN ta_person e ON t.share_person_id = e.person_id
+        WHERE t.target_type in ('dynamic','h5','help','live', 'group','activity') and t.org_id =
+        #{orgId}
+        and t.is_org_first = 1
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},
         '%Y-%m-%d' )
         <if test="activityId != null and activityId != ''">
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = #{activityType}
         </if>
         <if test="province != null and province != ''">
             and a.province like concat('%', #{province}, '%')