|
@@ -310,12 +310,12 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
|
System.out.println("currentWeekOfYear_e == " +endWeekOfYear);
|
|
|
|
|
|
int j = 12;
|
|
|
- for (int i=0; i < endWeekOfYear; i++) {
|
|
|
+ for (int i=0; i < endWeekOfYear + startWeekOfYear; i++) {
|
|
|
|
|
|
//只取两个日期之间的周
|
|
|
- if(startWeekOfYear > endWeekOfYear - i){
|
|
|
- break;
|
|
|
- }
|
|
|
+// if(startWeekOfYear > endWeekOfYear - i){
|
|
|
+// break;
|
|
|
+// }
|
|
|
int dayOfWeek = endCalendar.get(Calendar.DAY_OF_WEEK) - 2;
|
|
|
|
|
|
System.out.println("dayOfWeek == " +dayOfWeek);
|
|
@@ -540,7 +540,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
|
|
|
// System.out.println(i)
|
|
|
// );
|
|
|
// DateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
-// String start_time = "2022-02-01";
|
|
|
+// String start_time = "2021-12-01";
|
|
|
// String end_time = "2022-05-30";
|
|
|
// List<Map<String,Object>> lsit = getDateOfWeek(dateFormat.parse(start_time), dateFormat.parse(end_time));
|
|
|
// System.out.println(JSON.toJSONString(lsit));
|