张延森 před 5 roky
rodič
revize
5f81e65095
1 změnil soubory, kde provedl 9 přidání a 1 odebrání
  1. 9
    1
      src/main/resources/mapper/TsConsultantKpiMapper.xml

+ 9
- 1
src/main/resources/mapper/TsConsultantKpiMapper.xml Zobrazit soubor

158
         INNER JOIN ta_person t ON t.person_id = e.person_id
158
         INNER JOIN ta_person t ON t.person_id = e.person_id
159
         WHERE e.org_id = #{orgId}
159
         WHERE e.org_id = #{orgId}
160
         AND e.share_person = #{userId}
160
         AND e.share_person = #{userId}
161
+        AND (
162
+            e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
163
+            or ( e.target_type = 'share' and e.target_id = 'index' )
164
+        )
161
         AND e.create_date BETWEEN #{startDate} and #{endDate}
165
         AND e.create_date BETWEEN #{startDate} and #{endDate}
162
         <!-- building_id 字段数据不全
166
         <!-- building_id 字段数据不全
163
         <if test="buildingId != null and buildingId !=''">
167
         <if test="buildingId != null and buildingId !=''">
318
         WHERE e.org_id = #{orgId}
322
         WHERE e.org_id = #{orgId}
319
             AND e.share_person = #{userId}
323
             AND e.share_person = #{userId}
320
             AND e.create_date BETWEEN #{startDate} and #{endDate}
324
             AND e.create_date BETWEEN #{startDate} and #{endDate}
325
+            AND (
326
+                e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
327
+                OR ( e.target_type = 'share' AND e.target_id = 'index' )
328
+            )
321
             <!-- building_id 字段数据不全
329
             <!-- building_id 字段数据不全
322
             <if test="buildingId != null and buildingId !=''">
330
             <if test="buildingId != null and buildingId !=''">
323
                 AND e.building_id = #{buildingId}
331
                 AND e.building_id = #{buildingId}
324
             </if>
332
             </if>
325
             -->
333
             -->
326
 <!--            AND t.`status` = 1-->
334
 <!--            AND t.`status` = 1-->
327
-        GROUP BY t.person_id, DATE_FORMAT(e.create_date, '%Y%m%d')
335
+        GROUP BY t.person_id
328
         ORDER BY e.create_date DESC
336
         ORDER BY e.create_date DESC
329
     </select>
337
     </select>
330
 
338