|
|
|
@@ -26,8 +26,10 @@ import javax.servlet.http.HttpServletResponse; |
|
|
|
|
|
|
|
import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.LinkedHashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Set; |
|
|
|
|
|
|
|
/** |
|
|
|
* @author gongbiao |
|
|
|
@@ -178,7 +180,7 @@ public class NeuPosAdminController extends BaseController { |
|
|
|
example.setShopId(shopId); |
|
|
|
Date current = DateUtils.getDayBegin(new Date()); |
|
|
|
Date begin = DateUtils.getTimeAfterDays(-10, current); |
|
|
|
Map<String,PageInfo<Map>> result = new HashMap<String,PageInfo<Map>>(); |
|
|
|
Map<String,PageInfo<Map>> result = new LinkedHashMap<String,PageInfo<Map>>(); |
|
|
|
for (int i = 0 ; i< 10 ; i++) { |
|
|
|
Date _b = DateUtils.getTimeAfterDays(i, begin);; |
|
|
|
Date _e = DateUtils.getDayEnd(_b); |
|
|
|
|