java/XinQuanHealing.git

			@@ -236,14 +236,14 @@
			// 周
			// 获取本周7天格式为dd

			calendar.set(Calendar.DAY_OF_WEEK, Calendar.SUNDAY);
			calendar.set(Calendar.DAY_OF_WEEK, Calendar.MONDAY);
			for (int i = 1; i <= 7; i++) {
			Date time = calendar.getTime();
			String format1 = simpleDateFormat.format(time);
			x.put(format1,0);
			x1.put(format1,0);
			x2.put(format1,0);
			calendar.add(Calendar.DAY_OF_MONTH, 1);
			calendar.add(Calendar.DAY_OF_WEEK, 1);
			}
			break;
			case 4:
			@@ -258,6 +258,31 @@
			x2.put(format1,0);
			calendar.add(Calendar.DAY_OF_MONTH, 1);
			}
			break;
			case 5:
			String startTime = null;
			String endTime = null;
			if (org.springframework.util.StringUtils.hasLength(homeDto.getTime())){
			String[] split = homeDto.getTime().split(" - ");
			startTime = split[0];
			endTime = split[1];
			// 将其转化为LocalDate
			LocalDate startLocalDate = LocalDate.parse(startTime, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
			LocalDate endLocalDate = LocalDate.parse(endTime, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
			// 将startLocalDate到endLocalDate之间的每一天的日期，包括startLocalDate和endLocalDate
			List<LocalDate> localDates = new ArrayList<>();
			while (!startLocalDate.isAfter(endLocalDate)) {
			// 将startLocalDate转化为格式为yyyy-MM-dd格式字符串
			String format1 = startLocalDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
			x.put(format1,0);
			x1.put(format1,0);
			x2.put(format1,0);
			localDates.add(startLocalDate);
			startLocalDate = startLocalDate.plusDays(1);

			}
			}

			break;
			}
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			@@ -279,32 +304,29 @@
			switch (homeDto.getTimeType()){
			case 1:
			// 获取订单月份
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x.put(localDate+"",(int)x.get(value+"")+1);
			}else{
			if (StringUtils.hasLength(homeDto.getTime())&&x.get(value+"")!=null){
			x.put(value+"",(int)x.get(value+"")+1);
			}
			break;
			case 2:
			Date date = new Date();
			String format = simpleDateFormat.format(date);
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x.put(localDate+"",(int)x.get(value+"")+1);
			}else{
			x.put(format,(int)x.get(format)+1);
			if (StringUtils.hasLength(homeDto.getTime())&&x.get(value1+"")!=null){
			x.put(value1+"",(int)x.get(value1+"")+1);
			}
			break;
			case 3:
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x.put(localDate+"",(int)x.get(value+"")+1);
			}else{
			if (StringUtils.hasLength(homeDto.getTime())&&x.get(value1+"")!=null){
			x.put(value1+"",(int)x.get(value1+"")+1);
			}
			break;
			case 4:
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x.put(localDate+"",(int)x.get(value+"")+1);
			}else{
			if (StringUtils.hasLength(homeDto.getTime())&&x.get(value1+"")!=null){
			x.put(value1+"",(int)x.get(value1+"")+1);
			}
			break;
			case 5:
			if (StringUtils.hasLength(homeDto.getTime())&&x.get(value1+"")!=null){
			x.put(value1+"",(int)x.get(value1+"")+1);
			}
			break;
			@@ -314,33 +336,31 @@
			switch (homeDto.getTimeType()){
			case 1:
			// 获取订单月份
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x1.put(localDate+"",(int)x1.get(value+"")+1);
			}else{
			if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value+"")!=null){
			x1.put(value+"",(int)x1.get(value+"")+1);
			}
			break;
			case 2:
			Date date = new Date();
			String format = simpleDateFormat.format(date);
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x1.put(localDate+"",(int)x1.get(value+"")+1);
			}else{
			x1.put(format,(int)x1.get(format)+1);
			if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value1+"")!=null){
			x1.put(value1+"",(int)x1.get(value1+"")+1);

			}
			break;
			case 3:
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x1.put(localDate+"",(int)x1.get(value+"")+1);
			}else{
			x1.put(value+"",(int)x1.get(value+"")+1);
			if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value1+"")!=null){
			x1.put(value1+"",(int)x1.get(value1+"")+1);
			}
			break;
			case 4:
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x1.put(localDate+"",(int)x1.get(value+"")+1);
			}else{
			x1.put(value+"",(int)x1.get(value+"")+1);
			if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value1+"")!=null){
			x1.put(value1+"",(int)x1.get(value1+"")+1);
			}
			break;
			case 5:
			if (StringUtils.hasLength(homeDto.getTime())&&x1.get(value1+"")!=null){
			x1.put(value1+"",(int)x1.get(value1+"")+1);
			}
			break;
			}
			@@ -349,33 +369,33 @@
			switch (homeDto.getTimeType()){
			case 1:
			// 获取订单月份
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x2.put(localDate+"",(int)x2.get(value+"")+1);
			}else{
			if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value+"")!=null){
			x2.put(value+"",(int)x2.get(value+"")+1);
			}
			break;
			case 2:
			Date date = new Date();
			String format = simpleDateFormat.format(date);
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x2.put(localDate+"",(int)x2.get(value+"")+1);
			}else{
			x2.put(format,(int)x2.get(format)+1);
			if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value1+"")!=null){
			x2.put(value1+"",(int)x2.get(value1+"")+1);

			}
			break;
			case 3:
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x2.put(localDate+"",(int)x2.get(value+"")+1);
			}else{
			x2.put(value+"",(int)x2.get(value+"")+1);
			if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value1+"")!=null){

			x2.put(value1+"",(int)x2.get(value1+"")+1);
			}
			break;
			case 4:
			if (StringUtils.hasLength(homeDto.getTime())&&(!homeDto.getTime().equals("1"))){
			x2.put(localDate+"",(int)x2.get(value+"")+1);
			}else{
			x2.put(value+"",(int)x2.get(value+"")+1);
			if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value1+"")!=null){

			x2.put(value1+"",(int)x2.get(value1+"")+1);
			}
			break;
			case 5:
			if (StringUtils.hasLength(homeDto.getTime())&&x2.get(value1+"")!=null){
			x2.put(value1+"",(int)x2.get(value1+"")+1);
			}
			break;
			}
			@@ -466,7 +486,6 @@
			homeVO.setCourseOffOnline(split[4]);
			Integer i = Integer.valueOf(homeExport.getCourseCount());
			Integer i1 = Integer.valueOf(split[4]);
			homeExport.setCourseCount((i-i1)+"");
			}
			List<HomeExport> homeExports = new ArrayList<>();
			homeExports.add(homeExport);