@@ -363,7 +363,7 @@ public class EventCustomerInfoDao extends GenericHibernateDao<EventCustomerInfo,
sql.append(" e.resourceId, ");
sql.append(" e.groupNum, ");
sql.append(" e.uid, ");
sql.append(" CASE WHEN u.vipGrade is null THEN '嘉宾' WHEN ((u.vipGrade=2 or u.vipGrade=3) and date_add(u.communeAgainTime,INTERVAL '1' YEAR)>CURRENT_DATE() ) THEN '社员' else '非社员' end `userGrade`, ");
sql.append(" CASE WHEN u.vipGrade is null THEN '嘉宾' WHEN (u.vipGrade&2=2 and date_add(u.communeAgainTime,INTERVAL '1' YEAR)>CURRENT_DATE() ) THEN '社员' else '非社员' end `userGrade`, ");
sql.append(" CASE WHEN o.courseProductId=0 OR o.courseProductId IS NULL THEN ol.productId ELSE o.courseProductId END `productId`,");
sql.append(" CASE WHEN o.productName IS NULL THEN ol.productName ELSE o.productName END `productName`, ");
sql.append(" CASE WHEN o.playDate IS NULL THEN ol.priceDate ELSE o.playDate END `playDate`, ");
sb.append("SELECT sql_calc_found_rows a.id,a.uid,a.id as communeExtId,a.drawer,a.mobilePhone,a.userName,a.birthday,c.vipGrade,c.communeAgainTime,d.username AS bindedAdm,b.bindTime,b.labels");
sb.append("SELECT sql_calc_found_rows a.id,a.uid,a.id as communeExtId,a.drawer,a.mobilePhone,a.userName,a.birthday,c.vipGrade,c.communeAgainTime,d.username AS bindedAdm,b.bindTime,b.labels,a.customerRegion ,a.checkedRegion ");
sb.append(" FROM usr_commune_ext a LEFT JOIN usr_commune_adm b ON a.id = b.communeExtId");
sb.append(" LEFT JOIN bsc_userext c ON a.uid = c.uid");
sb.append(" LEFT JOIN adm_users d ON b.admUserId = d.id");
...
...
@@ -46,9 +46,21 @@ public class CommuneAdmDao extends GenericHibernateDao<CommuneAdm, Integer>{
if(StringUtils.isNotBlank(query.getDrawer())){
sb.append(" AND a.drawer = '"+query.getDrawer()+"'");