event stats cid campaignid

src/main/java/com/reyun/service/impl/ComplicatedEventsServiceImpl.java

@@ -1100,7 +1100,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                         jsonObjectTotal = addTwoJSONObject(selectFieldList, jsonObjectTotal, val);
                     }
 
-                    /*//2翻译推广活动或者渠道
+                    //2翻译推广活动或者渠道
                     if (val.containsKey(FIELD_CID)) {
                         String cid = val.getString(FIELD_CID);
                         val.put(FIELD_CID, channelMap.containsKey(cid) ? channelMap.get(cid) : cid);
@@ -1109,7 +1109,7 @@ public class ComplicatedEventsServiceImpl implements ComplicateEventsService{
                     if (val.containsKey(FIELD_CAMPAIGN_ID)) {
                         String campaignId = val.getString(FIELD_CAMPAIGN_ID);
                         val.put(FIELD_CAMPAIGN_ID, campaignMap.containsKey(campaignId) ? campaignMap.get(campaignId) : campaignId);
-                    }*/
+                    }
 
 
                     //添加到val中