feat:首页

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/IndexBaseDto.java

@@ -75,7 +75,7 @@ public class IndexBaseDto {
         this.indexMonthData = indexMonthData;
         if(!CollectionUtils.isEmpty(indexMonthData)){
             BigDecimal total = indexMonthData.stream().map(IndexBaseMonthData::getTotalNum).reduce(BigDecimal.ZERO, BigDecimal::add);
-            if(IndexDataType.ACTIVATION_RATE.equals(dataType)||IndexDataType.HOMEWORK_CREATE_RATE.equals(dataType)||IndexDataType.HOMEWORK_SUBMIT_RATE.equals(dataType)||IndexDataType.HOMEWORK_COMMENT_RATE.equals(dataType)){
+            if(IndexDataType.ACTIVATION_RATE.equals(dataType)){
                 if(total.compareTo(BigDecimal.ZERO)==0){
                     this.percent = BigDecimal.ZERO;
                 }else{

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

@@ -204,7 +204,7 @@
 		LEFT JOIN sys_user su ON sees.student_id_=su.id_
 		WHERE su.del_flag_=0
 			AND su.organ_id_ IS NOT NULL
-			AND MONTH(sees.monday_)=MONTH(CONCAT(#{dayStr}, '-01'))
+			AND (MONTH(sees.monday_)=MONTH(#{dayStr}) OR MONTH(sees.sunday_)=MONTH(#{dayStr}))
 			AND sees.monday_<=#{dayStr}
 		GROUP BY su.organ_id_
 		ORDER BY su.organ_id_