Ver código fonte

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

胡轶钦 5 anos atrás
pai
commit
9240fbad70

+ 1
- 1
src/main/resources/mapper/statistic/TsCustomerGenderStatisticMapper.xml Ver arquivo

46
                     t.enlist_id,
46
                     t.enlist_id,
47
                     c.*
47
                     c.*
48
                 FROM
48
                 FROM
49
-                    ta_activity_dynamic_enlist t
49
+                    ts_activity_dynamic_enlist t
50
                     LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
50
                     LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
51
                     AND t.building_id = c.building_id
51
                     AND t.building_id = c.building_id
52
                     AND t.org_id = c.org_id
52
                     AND t.org_id = c.org_id

+ 4
- 4
src/main/resources/mapper/statistic/TsCustomerStatisticDailyMapper.xml Ver arquivo

3
 <mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerStatisticDailyMapper">
3
 <mapper namespace="com.huiju.estateagents.statistic.mapper.TsCustomerStatisticDailyMapper">
4
 
4
 
5
     <delete id="deleteNowDate">
5
     <delete id="deleteNowDate">
6
-        delete from ta_customer_statistic_daily
6
+        delete from ts_customer_statistic_daily
7
         where customer_type = #{customerType}
7
         where customer_type = #{customerType}
8
         AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
8
         AND date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
9
     </delete>
9
     </delete>
13
             org_id,
13
             org_id,
14
             count( DISTINCT ( customer_id ) ) as customer_num
14
             count( DISTINCT ( customer_id ) ) as customer_num
15
         FROM
15
         FROM
16
-            ta_customer_follow_up_record
16
+            ts_customer_follow_up_record
17
         WHERE
17
         WHERE
18
             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
18
             date_format( create_date, '%Y-%m-%d' ) = date_format( #{nowDate}, '%Y-%m-%d' )
19
         GROUP BY
19
         GROUP BY
37
             count( DISTINCT ( c.customer_id ) ) as customer_num,
37
             count( DISTINCT ( c.customer_id ) ) as customer_num,
38
             c.org_id
38
             c.org_id
39
         FROM
39
         FROM
40
-            ta_activity_dynamic_enlist t
40
+            ts_activity_dynamic_enlist t
41
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
41
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
42
             AND t.building_id = c.building_id
42
             AND t.building_id = c.building_id
43
             AND t.org_id = c.org_id
43
             AND t.org_id = c.org_id
52
         SELECT
52
         SELECT
53
           *
53
           *
54
         FROM
54
         FROM
55
-          ta_customer_statistic_daily
55
+          ts_customer_statistic_daily
56
         WHERE
56
         WHERE
57
           org_id = #{orgId}
57
           org_id = #{orgId}
58
         AND customer_type = #{customerType}
58
         AND customer_type = #{customerType}

+ 3
- 3
src/main/resources/mapper/statistic/TsCustomerStatisticMonthlyMapper.xml Ver arquivo

22
             org_id,
22
             org_id,
23
             count( DISTINCT ( customer_id ) ) as customer_num
23
             count( DISTINCT ( customer_id ) ) as customer_num
24
         FROM
24
         FROM
25
-            ta_customer_follow_up_record
25
+            ts_customer_follow_up_record
26
         WHERE
26
         WHERE
27
             date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
27
             date_format( create_date, '%Y-%m' ) = date_format( #{nowDate}, '%Y-%m' )
28
         GROUP BY
28
         GROUP BY
34
             count( DISTINCT ( c.customer_id ) ) as customer_num,
34
             count( DISTINCT ( c.customer_id ) ) as customer_num,
35
             c.org_id
35
             c.org_id
36
         FROM
36
         FROM
37
-            ta_activity_dynamic_enlist t
37
+            ts_activity_dynamic_enlist t
38
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
38
             LEFT JOIN ta_recommend_customer c ON t.person_id = c.person_id
39
             AND t.building_id = c.building_id
39
             AND t.building_id = c.building_id
40
             AND t.org_id = c.org_id
40
             AND t.org_id = c.org_id
48
         SELECT
48
         SELECT
49
           *
49
           *
50
         FROM
50
         FROM
51
-          ta_customer_statistic_monthly
51
+          ts_customer_statistic_monthly
52
         WHERE
52
         WHERE
53
           org_id = #{orgId}
53
           org_id = #{orgId}
54
         AND customer_type = #{customerType}
54
         AND customer_type = #{customerType}