|
|
@@ -111,19 +111,19 @@
|
|
|
c.now_street_id as nowStreetId,
|
|
|
c.now_street_name as nowStreetName,
|
|
|
c.customer_sign_id as customerSignId,
|
|
|
- c.customer_type_id as customerTypeId,
|
|
|
- c.customer_type as customerType,
|
|
|
+ cs.customer_type_id as customerTypeId,
|
|
|
+ cs.customer_type as customerType,
|
|
|
c.age as age,
|
|
|
c.sex as sex,
|
|
|
if(sum(IF( d.settlement = 1, 1, 0 ) )>0,1,0) as category
|
|
|
FROM
|
|
|
${dbName}_finance.c_card_acc_detail d
|
|
|
,${dbName}_customer.c_customer_subsidy_${operatorId} c
|
|
|
+ ,${dbName}_customer.c_customer_subsidy_supplier_${operatorId} cs
|
|
|
where c.subsidy_customer_id = d.subsidy_customer_id
|
|
|
- and c.yn = 0 AND d.yn = 0
|
|
|
- and c.customer_type_id is not null
|
|
|
- and c.customer_type is not null
|
|
|
- and c.enabled = 1
|
|
|
+ and cs.subsidy_customer_id = c.subsidy_customer_id
|
|
|
+ and c.yn = 0 AND d.yn = 0 AND cs.yn = 0
|
|
|
+ and cs.enabled = 1
|
|
|
and ${ew.sqlSegment}
|
|
|
GROUP BY c.subsidy_customer_id
|
|
|
</select>
|
qin