修改统计

src/main/java/com/xjrsoft/module/hikvision/util/OutInRecordUtil.java

@@ -243,7 +243,8 @@ public class OutInRecordUtil {
                 " INNER JOIN attendance_rule_details t2 ON t1.id = t2.attendance_rule_category_id" +
                 " INNER JOIN attendance_user_relation t3 ON t1.id = t3.attendance_rule_category_id" +
                 " WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND NOW() BETWEEN start_date AND end_date" +
-                " AND t2.date_type = '" + dayOfWeek + "' and t3.user_id = " + userId;
+                " AND t2.date_type = '" + dayOfWeek + "' and t3.user_id = " + userId +
+                " ORDER BY t1.end_date DESC";
         List<Map<String, Object>> ruleDetailsList = SqlRunnerAdapter.db().selectList(sql, AttendanceRuleDetails.class);
         if (!ruleDetailsList.isEmpty()) {
             AttendanceRuleDetails ruleDetails = SqlRunnerAdapterUtil.convertMapToEntity(ruleDetailsList.get(0), AttendanceRuleDetails.class);
@@ -302,7 +303,8 @@ public class OutInRecordUtil {
                 " INNER JOIN base_student_school_roll t4 ON t3.class_id = t4.class_id AND t1.stduy_status=t4.stduy_status" +
                 " WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND NOW() BETWEEN start_date AND end_date" +
                 " AND t4.delete_mark = 0 " +
-                " AND t2.date_type = '" + dayOfWeek + "' and t4.user_id = " + studentUserId;
+                " AND t2.date_type = '" + dayOfWeek + "' and t4.user_id = " + studentUserId +
+                " ORDER BY t1.end_date DESC";
         List<Map<String, Object>> ruleDetailsList = SqlRunnerAdapter.db().selectList(sql, AttendanceRuleDetails.class);
         if (!ruleDetailsList.isEmpty()) {
             AttendanceRuleDetails ruleDetails = SqlRunnerAdapterUtil.convertMapToEntity(ruleDetailsList.get(0), AttendanceRuleDetails.class);