Przeglądaj źródła

feat: 用户协议调整

Joburgess 4 lat temu
rodzic
commit
1e437d5bdd

+ 3 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/IndexBaseMonthDataServiceImpl.java

@@ -116,9 +116,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 			Set<String> hasMonths = typeDateMapEntry.getValue().stream().map(d -> DateUtil.dateToString(d.getMonth(), "yyyy-MM-dd")).collect(Collectors.toSet());
 			LocalDate currentMonthDate = startDate;
 			while (currentMonthDate.compareTo(endDate)<=0){
-				if(IndexDataType.HOMEWORK_CREATE_RATE.equals(typeDateMapEntry.getKey())
+				if((IndexDataType.HOMEWORK_CREATE_RATE.equals(typeDateMapEntry.getKey())
 					||IndexDataType.HOMEWORK_SUBMIT_RATE.equals(typeDateMapEntry.getKey())
-					||IndexDataType.HOMEWORK_COMMENT_RATE.equals(typeDateMapEntry.getKey())){
+					||IndexDataType.HOMEWORK_COMMENT_RATE.equals(typeDateMapEntry.getKey()))
+					&&currentMonthDate.getDayOfWeek()!=DayOfWeek.MONDAY){
 					currentMonthDate = currentMonthDate.plusDays(1);
 					continue;
 				}