Bladeren bron

feat:首页数据

Joburgess 4 jaren geleden
bovenliggende
commit
66465cd2dd

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

@@ -125,7 +125,7 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 				indexBaseMonthData.setPercent(BigDecimal.ZERO);
 				indexBaseMonthData.setDataType(typeDateMapEntry.getKey());
 				typeDateMapEntry.getValue().add(indexBaseMonthData);
-				currentMonthDate = currentMonthDate.plusMonths(1);
+				currentMonthDate = currentMonthDate.plusDays(1);
 			}
 			typeDateMapEntry.getValue().sort(Comparator.comparing(IndexBaseMonthData::getMonth));
 			if(IndexDataType.ACTIVATION_RATE.equals(typeDateMapEntry.getKey())||IndexDataType.HOMEWORK_CREATE_RATE.equals(typeDateMapEntry.getKey())

+ 1 - 1
mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentServeServiceImpl.java

@@ -350,7 +350,7 @@ public class StudentServeServiceImpl implements StudentServeService {
         Set<Integer> noCourseServeStudentIds = allServeStudentIds.stream().filter(id -> !haveCourseBeServeStudentIds.contains(id)).collect(Collectors.toSet());
 
         Set<Integer> musicStudentIds = new HashSet<>();
-        if(Objects.isNull(noCourseServeStudentIds)){
+        if(!Objects.isNull(noCourseServeStudentIds)){
             musicStudentIds.addAll(noCourseServeStudentIds);
         }
         if(!CollectionUtils.isEmpty(musicCourseStudentIds)){

+ 2 - 2
mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -129,10 +129,10 @@
 				</foreach>
 			</if>
 			<if test="startMonth!=null and startMonth!=''">
-				AND DATE_FORMAT(month_, '%Y-%m')&gt;=#{startMonth}
+				AND month_&gt;=#{startMonth}
 			</if>
 			<if test="endMonth!=null and endMonth!=''">
-				AND DATE_FORMAT(month_, '%Y-%m')&lt;=#{endMonth}
+				AND month_&lt;=#{endMonth}
 			</if>
 		</where>
 		GROUP BY month_,data_type_