Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/excel/IntentionUser.java

@@ -35,4 +35,45 @@ public class IntentionUser {
     @ExcelProperty(value = "意向值", index = 3)
     private Integer intention;
 
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 4)
+    private String province;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问", index = 5)
+    private String realtyConsultant;
+
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问电话", index = 6)
+    private String realtyConsultantPhone;
+
+    /**
+     * 分享者
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者", index = 7)
+    private String sharePersonName;
+
+    /**
+     * 分享者电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者电话", index = 8)
+    private String sharePersonPhone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 9)
+    private String gender;
 }

src/main/resources/mapper/TaBuildingMapper.xml

@@ -451,8 +451,10 @@
                 u.be_uv AS building_id
             FROM
                 ta_uv u
-            WHERE
+            LEFT JOIN ta_person p ON u.person_id = p.person_id
+        WHERE
                 u.tagert_type = 'project'
+                AND p.org_id = #{orgId}
             <if test="startDate != null">
                 and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
             </if>
@@ -631,21 +633,23 @@
         LEFT JOIN (
             SELECT
                 count( * ) AS uv_num,
-                be_uv AS building_id,
-                DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+                u.be_uv AS building_id,
+                DATE_FORMAT( u.create_date, '%Y-%m-%d' ) AS create_date
             FROM
-                ta_uv
+                ta_uv u
+                LEFT JOIN ta_person p ON u.person_id = p.person_id
             WHERE
                 tagert_type = 'project'
-                AND be_uv = #{buildingId}
+                AND p.org_id = #{orgId}
+                AND u.be_uv = #{buildingId}
                 <if test="startDate != null">
-                    and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+                    and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
                 </if>
                 <if test="endDate != null">
-                    and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+                    and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
                 </if>
             GROUP BY
-                DATE_FORMAT( create_date, '%Y-%m-%d' )
+                DATE_FORMAT( u.create_date, '%Y-%m-%d' )
         ) u ON t.date = u.create_date
         ORDER BY create_date
     </select>
@@ -714,21 +718,23 @@
         LEFT JOIN (
         SELECT
         count( * ) AS uv_num,
-        be_uv AS building_id,
-        DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+        u.be_uv AS building_id,
+        DATE_FORMAT( u.create_date, '%Y-%m-%d' ) AS create_date
         FROM
-        ta_uv
+        ta_uv u
+        LEFT JOIN ta_person p ON u.person_id = p.person_id
         WHERE
-        tagert_type = 'project'
-        AND be_uv = #{buildingId}
+        u.tagert_type = 'project'
+        AND p.org_id = #{orgId}
+        AND u.be_uv = #{buildingId}
         <if test="startDate != null">
-            and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+            and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
         </if>
         <if test="endDate != null">
-            and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+            and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
         </if>
         GROUP BY
-        DATE_FORMAT( create_date, '%Y-%m-%d' )
+        DATE_FORMAT( u.create_date, '%Y-%m-%d' )
         ) u ON t.date = u.create_date
         ORDER BY
         <if test="sortField != null and sortField != ''">

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -43,31 +43,79 @@
         ORDER BY SUM(tpir.intention) DESC
     </select>
     <select id="selectExportIntentionUser" resultType="com.huiju.estateagents.excel.IntentionUser">
+        select t.*, IFNULL(b.nickname, c.user_name) as sharePersonName, ifnull(b.phone, c.phone) as sharePersonPhone From (
+
         SELECT
-        tpir.person_name as  person_name,
+        tpir.person_name as person_name,
+        if(tp.gender = '1' , '男', if(tp.gender = '2', '女', '未知')) as gender,
         tp.phone as phone,
-        tpir.building_name as building_name,
+        tp.province,
+        tpir.person_id,
+        tpir.building_name,
+        tpir.building_id,
+        d.user_name as realtyConsultant,
+        d.phone as realtyConsultantPhone,
         SUM(tpir.intention) as intention
-        FROM
-        ta_person_intention_record tpir
-        LEFT JOIN ta_person tp on tpir.person_id = tp.person_id
+
+        FROM ta_person_intention_record tpir
+        LEFT JOIN ta_person tp ON tpir.person_id = tp.person_id
+        left join ta_recommend_customer c on c.person_id = tpir.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
         <trim prefix="where" prefixOverrides="and | or">
-            <if test="buildingId != null and buildingId != ''">
-                tpir.building_id = #{buildingId}
-            </if>
             <if test="orgId != null">
                 AND tpir.org_id = #{orgId}
                 AND tp.org_id = #{orgId}
             </if>
+        </trim>
+        GROUP BY tpir.person_id, tpir.building_id
+
+        ) as t
+        left join ta_share_person_from a on t.person_id = a.person_id
+        left join ta_user c on a.share_person = c.user_id
+        left join ta_person b on a.share_person = b.person_id
+
+        <trim prefix="where" prefixOverrides="and | or">
+            <if test="buildingId != null and buildingId != ''">
+                t.building_id = #{buildingId}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND tpir.building_id in
+                AND t.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
         </trim>
-        GROUP BY
-        tpir.person_id, tpir.building_id
-        ORDER BY SUM(tpir.intention) DESC
+
+        group by t.person_id, t.building_id
+        order by t.intention desc
+
+
+
+<!--        SELECT-->
+<!--        tpir.person_name as  person_name,-->
+<!--        tp.phone as phone,-->
+<!--        tpir.building_name as building_name,-->
+<!--        SUM(tpir.intention) as intention-->
+<!--        FROM-->
+<!--        ta_person_intention_record tpir-->
+<!--        LEFT JOIN ta_person tp on tpir.person_id = tp.person_id-->
+<!--        <trim prefix="where" prefixOverrides="and | or">-->
+<!--            <if test="buildingId != null and buildingId != ''">-->
+<!--                tpir.building_id = #{buildingId}-->
+<!--            </if>-->
+<!--            <if test="orgId != null">-->
+<!--                AND tpir.org_id = #{orgId}-->
+<!--                AND tp.org_id = #{orgId}-->
+<!--            </if>-->
+<!--            <if test="personBuildingList != null and personBuildingList.size > 0">-->
+<!--                AND tpir.building_id in-->
+<!--                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">-->
+<!--                    #{personBuilding.buildingId}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--        </trim>-->
+<!--        GROUP BY-->
+<!--        tpir.person_id, tpir.building_id-->
+<!--        ORDER BY SUM(tpir.intention) DESC-->
     </select>
 </mapper>

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

@@ -1197,7 +1197,7 @@
         and a.status = 1
         and a.is_first_time = 1
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
-            and a.target_type = #{targetType}
+            and a.target_type = concat(REPLACE(#{targetType}, 'activity', 'dynamic'), '_share')
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1210,8 +1210,7 @@
         </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 substring_index(addRegistNum.target_type,
-        '_share', 1) = activity.activityType
+        ) as addRegistNum on addRegistNum.target_id = activity.activityId and REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity') = activity.activityType
         <if test="targetType != null and targetType != ''">
             where activity.activityType = #{targetType}
         </if>
@@ -1410,7 +1409,7 @@
         and a.status = 1
         and a.is_first_time = 1
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
-            and a.target_type = #{targetType}
+            and a.target_type = concat(REPLACE(#{targetType}, 'activity', 'dynamic'), '_share')
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1423,8 +1422,7 @@
         </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 substring_index(addRegistNum.target_type,
-        '_share', 1) = activity.activityType
+        ) as addRegistNum on addRegistNum.target_id = activity.activityId and REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity') = activity.activityType
         <if test="targetType != null and targetType != ''">
             where activity.activityType = #{targetType}
         </if>
@@ -1972,18 +1970,18 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         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
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        d.phone as realtyConsultantPhone,
+        ifnull(e.nickname, f.name) as sharePersonName,
+        ifnull(e.phone, f.phone) 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 = #{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
-        left join ta_person e on t.share_person = e.person_id
-        left join ta_user f on t.share_person = f.user_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
@@ -1993,7 +1991,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(#{activityType}, '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
         <if test="province != null and province != ''">
             and a.province like concat('%', #{province}, '%')
@@ -2035,7 +2033,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(#{activityType}, '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
         <if test="province != null and province != ''">
             and a.province like concat('%', #{province}, '%')