PC端首页统计数据修改

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/IndexMgrController.java

@@ -301,18 +301,18 @@ public class IndexMgrController extends BaseApiController {
 	 */
 	private IndexQueryParam getQueryParam(IndexQueryParam indeQueryParam) {
 		IndexQueryParam queryParam = new IndexQueryParam();
-		queryParam.setDays(null != indeQueryParam && null != indeQueryParam.getDays()?indeQueryParam.getDays():7);
+		queryParam.setDays(null != indeQueryParam && null != indeQueryParam.getDays()?indeQueryParam.getDays(): 7);
 		queryParam.setLevel(null != indeQueryParam && StringUtils.isNotBlank(indeQueryParam.getLevel())?indeQueryParam.getLevel():"day");
 		if(queryParam.getDays() == 0) { // 自定义
 			if(null != indeQueryParam.getStartTime() && null != indeQueryParam.getEndTime()) {
 				queryParam.setStartTime(indeQueryParam.getStartTime());
 				queryParam.setEndTime(indeQueryParam.getEndTime());
 			}else {
-				queryParam.setStartTime(DateUtils.getPreDayOfNowZero(7));
+				queryParam.setStartTime(DateUtils.getPreDayOfNowZero(6));
 				queryParam.setEndTime(new Date());
 			}
 		}else {
-			queryParam.setStartTime(DateUtils.getPreDayOfNowZero(queryParam.getDays()));
+			queryParam.setStartTime(DateUtils.getPreDayOfNowZero(queryParam.getDays() - 1));
 			queryParam.setEndTime(new Date());
 		}
 		return queryParam;

mp-common/src/main/java/com/qs/mp/common/utils/DateUtils.java

@@ -254,7 +254,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
  		try {
 			Calendar c = Calendar.getInstance();
 		   	c.setFirstDayOfWeek(Calendar.MONDAY); 
-		   	c.add(Calendar.DATE, - (days - 1));
+		   	c.add(Calendar.DATE, - days);
 		   	return c.getTime(); 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -270,7 +270,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
   		try {
 			Calendar c = Calendar.getInstance();
 		   	c.setFirstDayOfWeek(Calendar.MONDAY); 
-		   	c.add(Calendar.DATE, - (days - 1));
+		   	c.add(Calendar.DATE, - days);
 		   	c.set(Calendar.HOUR_OF_DAY, 0);
 		   	c.set(Calendar.MINUTE, 0);
 		   	c.set(Calendar.SECOND, 0);
@@ -540,11 +540,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
 //              System.out.println(i)
 //      );
     	DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
-        String start_time = "2021-01-01";
-		String end_time = "2022-01-30";
-		List<Map<String,Object>> lsit = getDateOfWeek(dateFormat.parse(start_time), dateFormat.parse(end_time));  
-		System.out.println(JSON.toJSONString(lsit));
+//        String start_time = "2021-01-01";
+//		String end_time = "2022-01-30";
+//		List<Map<String,Object>> lsit = getDateOfWeek(dateFormat.parse(start_time), dateFormat.parse(end_time));  
+//		System.out.println(JSON.toJSONString(lsit));
 		
+		System.out.println(dateFormat.format(getPreDayOfNowZero(2)));
 		
 //		List<String> monthList = addMonths(dateFormat.parse(start_time), dateFormat.parse(end_time));
 //		System.out.println(JSON.toJSONString(monthList));