zouxuan преди 1 година
родител
ревизия
550ca0ee2b

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

@@ -588,9 +588,10 @@ public class IndexBaseMonthDataServiceImpl extends BaseServiceImpl<Long, IndexBa
 
 	//业务数据
 	public void businessData(String dayStr,Integer tenantId,LocalDate monday){
-		saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, null,tenantId), monday.toString(), IndexDataType.HOMEWORK_CREATE_RATE, tenantId);
-		saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, "submit",tenantId), monday.toString(), IndexDataType.HOMEWORK_SUBMIT_RATE, tenantId);
-		saveData(indexBaseMonthDataDao.getHomeworkData(dayStr, "comment",tenantId), monday.toString(), IndexDataType.HOMEWORK_COMMENT_RATE, tenantId);
+		String month = DateUtil.dateToString(DateUtil.getFirstDayOfMonth(DateUtil.stringToDate(dayStr, DateUtil.DEFAULT_PATTERN)), DateUtil.ISO_EXPANDED_DATE_FORMAT);
+		saveData(indexBaseMonthDataDao.getHomeworkData(month, null,tenantId), monday.toString(), IndexDataType.HOMEWORK_CREATE_RATE, tenantId);
+		saveData(indexBaseMonthDataDao.getHomeworkData(month, "submit",tenantId), monday.toString(), IndexDataType.HOMEWORK_SUBMIT_RATE, tenantId);
+		saveData(indexBaseMonthDataDao.getHomeworkData(month, "comment",tenantId), monday.toString(), IndexDataType.HOMEWORK_COMMENT_RATE, tenantId);
 	}
 
 	//课程数据

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

@@ -334,8 +334,7 @@
 		WHERE su.del_flag_='0' and sees.tenant_id_ = #{tenantId}
 		  	AND tea.job_nature_='FULL_TIME'
 			AND su.organ_id_ IS NOT NULL
-			AND sees.monday_ &lt;= CONCAT(#{dayStr},' 23:59:59')
-			AND sees.sunday_ &gt;= CONCAT(#{dayStr},' 00:00:00')
+			AND sees.monday_ = CONCAT(#{dayStr},' 00:00:00')
 		GROUP BY su.organ_id_
 		ORDER BY su.organ_id_
 	</select>

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

@@ -1047,7 +1047,8 @@
     </update>
 
     <update id="cleanStudentCloudStudySequenceDays">
-        UPDATE student SET cloud_study_sequence_days_=0,cloud_study_use_last_day_=date_sub(curdate(), interval 1 day) WHERE cloud_study_use_last_day_&lt;date_sub(curdate(), interval 1 day)
+        UPDATE student SET cloud_study_sequence_days_=0,cloud_study_use_last_day_=date_sub(curdate(), interval 1 day)
+        WHERE cloud_study_use_last_day_&lt;date_sub(curdate(), interval 1 day)
     </update>
     <update id="cleanCountFlag">
         UPDATE student SET count_flag_ = 0 WHERE count_flag_ = 1