| @@ -85,7 +85,7 @@ public class WxRaffleActivityRecord extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<WxRaffleActivityRecordItem> recordItemList; | private List<WxRaffleActivityRecordItem> recordItemList; | ||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private List<Long> recordItemIdList; | |||||
| private Map<String,Integer> recordItemIdCountMap; | |||||
| public String generateItemDetaiJson() { | public String generateItemDetaiJson() { | ||||
| if (null != recordItemList && recordItemList.size() > 0 ) { | if (null != recordItemList && recordItemList.size() > 0 ) { | ||||
| @@ -103,10 +103,17 @@ public class WxRaffleActivityRecord extends TenantEntity { | |||||
| public void generateItemIds() { | public void generateItemIds() { | ||||
| if (null != recordItemList && recordItemList.size() > 0 ) { | if (null != recordItemList && recordItemList.size() > 0 ) { | ||||
| recordItemIdList = new ArrayList<Long>(); | |||||
| recordItemIdCountMap = new HashMap<String,Integer>(); | |||||
| for (int i = 0 ; i < recordItemList.size() ; i++) { | for (int i = 0 ; i < recordItemList.size() ; i++) { | ||||
| WxRaffleActivityRecordItem ri = recordItemList.get(i); | WxRaffleActivityRecordItem ri = recordItemList.get(i); | ||||
| recordItemIdList.add(ri.getItemId()); | |||||
| String key = this.id+"&"+ri.getItemId(); | |||||
| if (recordItemIdCountMap.containsKey(key)) { | |||||
| Integer c = recordItemIdCountMap.get(key); | |||||
| c = c + 1; | |||||
| recordItemIdCountMap.put(key, c); | |||||
| }else { | |||||
| recordItemIdCountMap.put(key, 1); | |||||
| } | |||||
| } | } | ||||
| } | } | ||||
| } | } | ||||
| @@ -152,8 +159,9 @@ public class WxRaffleActivityRecord extends TenantEntity { | |||||
| for (Iterator<Long> it = itemMap.keySet().iterator();it.hasNext();) { | for (Iterator<Long> it = itemMap.keySet().iterator();it.hasNext();) { | ||||
| Long itemId = it.next(); | Long itemId = it.next(); | ||||
| WxRaffleActivityItem item = itemMap.get(itemId); | WxRaffleActivityItem item = itemMap.get(itemId); | ||||
| if (null != recordItemIdList && recordItemIdList.contains(itemId)) { | |||||
| excelObject.put(String.valueOf(item.getId()), 1); | |||||
| String key = this.id+"&"+item.getId(); | |||||
| if (null != recordItemIdCountMap && recordItemIdCountMap.containsKey(key)) { | |||||
| excelObject.put(String.valueOf(item.getId()), recordItemIdCountMap.get(key)); | |||||
| }else { | }else { | ||||
| excelObject.put(String.valueOf(item.getId()), 0); | excelObject.put(String.valueOf(item.getId()), 0); | ||||
| } | } | ||||