Subversion Repositories SmartDukaan

Rev

Rev 31308 | Rev 31318 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 31308 Rev 31315
Line 2215... Line 2215...
2215 
			throws Exception {
 2215 
			throws Exception {
2216 
 
 2216 
 
2217 
		YearMonth now = YearMonth.now();
 2217 
		YearMonth now = YearMonth.now();
2218 
		YearMonth ym = YearMonth.now().minusMonths(12);
 2218 
		YearMonth ym = YearMonth.now().minusMonths(12);
2219 
		List<YearMonth> list = new ArrayList<>();
 2219 
		List<YearMonth> list = new ArrayList<>();
2220 
		while (!ym.isAfter(now)) {
 2220 
		while (!now.isBefore(ym)) {
2221 
			list.add(ym);
 2221 
			list.add(now);
2222 
			ym = ym.plusMonths(1);
 2222 
			now = now.minusMonths(1);
2223 
		}
 2223 
		}
2224 
 
 2224 
 
2225 
		model.addAttribute("yearMonth", list);
 2225 
		model.addAttribute("yearMonth", list);
2226 
 
 2226 
 
2227 
		List<PartnerMonthlySaleModel> partnerMonthlySaleModels = fofoOrderItemRepository
 2227 
		List<PartnerMonthlySaleModel> partnerMonthlySaleModels = fofoOrderItemRepository
Line 2251... Line 2251...
2251 
			throws Exception {
 2251 
			throws Exception {
2252 
 
 2252 
 
2253 
		YearMonth now = YearMonth.now();
 2253 
		YearMonth now = YearMonth.now();
2254 
		YearMonth ym = YearMonth.now().minusMonths(12);
 2254 
		YearMonth ym = YearMonth.now().minusMonths(12);
2255 
		List<YearMonth> list = new ArrayList<>();
 2255 
		List<YearMonth> list = new ArrayList<>();
2256 
		while (!ym.isAfter(now)) {
 2256 
		while (!now.isBefore(ym)) {
2257 
			list.add(ym);
 2257 
			list.add(now);
2258 
			ym = ym.plusMonths(1);
 2258 
			now = now.minusMonths(1);
2259 
		}
 2259 
		}
2260 
 
 2260 
 
2261 
		model.addAttribute("yearMonth", list);
 2261 
		model.addAttribute("yearMonth", list);
2262 
		ArrayList<in.shop2020.model.v1.order.OrderStatus> orderStatus = new ArrayList<>();
 2262 
		ArrayList<in.shop2020.model.v1.order.OrderStatus> orderStatus = new ArrayList<>();
2263 
 
 2263