实到人数调整

src/main/java/com/xjrsoft/module/attendance/controller/StudentStatisticsController.java

@@ -105,7 +105,13 @@ public class StudentStatisticsController {
                     leaveCount = classLeaveCount.get(record.getId());
                 }
                 record.setLeaveCount(leaveCount);
-                record.setActualCount(notStayMap.get(record.getId()).size());
+                int actualCount = 0;
+                for (StudentOutInRecordVo outInRecordVo : notStayMap.get(record.getId())) {
+                    if(outInRecordVo.getStatus() == 1){
+                        actualCount ++;
+                    }
+                }
+                record.setActualCount(actualCount);
 
                 Integer lateCount = 0;
                 for (StudentOutInRecordVo outInRecord : notStayMap.get(record.getId())) {

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

@@ -185,7 +185,7 @@ public class Out_In_RecordUtil {
         List<AttendanceRuleDetails> ruleDetailsList = use.query(sql, AttendanceRuleDetails.class);
         if(!ruleDetailsList.isEmpty()){
             AttendanceRuleDetails ruleDetails = ruleDetailsList.get(0);
-            if(ruleDetails.getIsAttendance() != null && ruleDetails.getIsAttendance() == 0){
+            if(ruleDetails.getIsAllowInOutSchool() != null && ruleDetails.getIsAllowInOutSchool() == 0){
                 attendanceStatus = "不考勤";
             }else{
                 LocalDateTime amStartTime = null, amEndTime = null, pmStartTime = null, pmEndTime = null, eveningStartTime = null, eveningEndTime = null;

src/main/resources/mapper/outin/StudentOutInRecordMapper.xml

@@ -23,21 +23,21 @@
     <select id="getNotStayList" resultType="com.xjrsoft.module.outint.vo.StudentOutInRecordVo">
         SELECT t1.* FROM student_out_in_record t1
         INNER JOIN base_student_school_roll t2 ON t1.user_id = t2.user_id
-        WHERE t1.delete_mark = 0 AND t1.status = 0 AND t2.delete_mark = 0
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
         AND t2.stduy_status = 'FB3002'
         AND t1.record_time BETWEEN #{startTime} AND #{endTime}
     </select>
     <select id="getStayList" resultType="com.xjrsoft.module.outint.vo.StudentOutInRecordVo">
         SELECT t1.* FROM student_out_in_record t1
         INNER JOIN base_student_school_roll t2 ON t1.user_id = t2.user_id
-        WHERE t1.delete_mark = 0 AND t1.status = 0 AND t2.delete_mark = 0
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
         AND t2.stduy_status = 'FB3001'
         AND t1.record_time BETWEEN #{startTime} AND #{endTime}
     </select>
     <select id="getList" resultType="com.xjrsoft.module.outint.vo.StudentOutInRecordVo">
         SELECT t1.* FROM student_out_in_record t1
         INNER JOIN base_student_school_roll t2 ON t1.user_id = t2.user_id
-        WHERE t1.delete_mark = 0 AND t1.status = 0 AND t2.delete_mark = 0
+        WHERE t1.delete_mark = 0 AND t2.delete_mark = 0
         AND t1.record_time BETWEEN #{startTime} AND #{endTime}
     </select>
 </mapper>

src/test/java/com/xjrsoft/module/job/HikvisionBaseDataTaskTest.java

@@ -105,8 +105,8 @@ class HikvisionBaseDataTaskTest {
 //        selectCar(use, carTableName);
 
         outInRecordUtil.GetTeacherAndStudentRecords(use,faceImportMapper);
-//        selecAllPersonById(use);
-        selectResource(use);
+////        selecAllPersonById(use);
+//        selectResource(use);
     }
 
     public static void selectCar(Db db, String tableName) throws SQLException {