fix

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

@@ -143,14 +143,14 @@ public class ActivityStatisticController extends BaseController {
                                                    @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                                    @RequestParam(value = "sharePersonType", required = false)String sharePersonType,
                                                    @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
-                                                   @RequestParam(value = "sharePhone", required = false)String sharePhone,
+                                                   @RequestParam(value = "sharePersonPhone", required = false)String sharePersonPhone,
                                                    @RequestParam(value = "activityId", required = false)String activityId,
                                                    @RequestParam(value = "activityType", required = false)String activityType,
                                                    @RequestParam(value = "sort", required = false)String sort,
                                                    @RequestParam(value = "colKey", required = false)String colKey,
                                                    @RequestParam(value = "buildingId", required = false)String buildingId,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePersonPhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**

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

@@ -182,7 +182,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
@@ -260,7 +260,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
@@ -338,7 +338,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
@@ -394,7 +394,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
@@ -449,7 +449,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
@@ -511,7 +511,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
@@ -736,7 +736,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
@@ -1501,7 +1501,9 @@
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
         and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.org_id = #{orgId} group by t.share_person ) t
+        and t.org_id = #{orgId}
+<!--        group by t.share_person -->
+        ) 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 visitPersonNum on visitPersonNum.person_id = person.person_id
@@ -1677,7 +1679,8 @@
             and t.be_share = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.tagert_type = #{activityType}
+            and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
+            end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and (