|
|
@@ -447,7 +447,7 @@ public class FinanceQueryDaoImpl implements FinanceQueryDao {
|
|
|
selSql.append(" ) AS derver_count");
|
|
|
selSql.append(" from fx_merchant t ");
|
|
|
selSql.append(" LEFT JOIN tb_lib_join j on t.lib_id=j.id ");
|
|
|
- selSql.append(" where t.`status`!=4 and t.type in (1,2,6) ");
|
|
|
+ selSql.append(" where t.`status`!=4 and t.type in (1,2,5,6) ");
|
|
|
selSql.append(" and (t.sign_type=0 OR t.id in (SELECT m.from_merchant_id from tb_lib_join_consume m WHERE m.type in (2,3) ");
|
|
|
if(!StringUtil.isEmpty(params.get("startMonth"))){
|
|
|
selSql.append(" AND DATE_FORMAT(m.create_time,'%Y-%m')=? ");
|
