Prechádzať zdrojové kódy

班级考勤,班级查询条件

dzx 1 rok pred
rodič
commit
322bb0a188

+ 0 - 12
src/main/java/com/xjrsoft/module/hikvision/util/Out_In_RecordUtil.java

@@ -151,21 +151,11 @@ public class Out_In_RecordUtil {
                             .withMinute(ruleDetails.getPmEndTime().getMinute())
                             .withSecond(ruleDetails.getPmEndTime().getSecond());
                 }
-                if(ruleDetails.getEveningStatus() != null && ruleDetails.getEveningStatus() == 1){
-                    eveningStartTime = recordTime.withHour(ruleDetails.getEveningStartTime().getHour())
-                            .withMinute(ruleDetails.getEveningStartTime().getMinute())
-                            .withSecond(ruleDetails.getEveningStartTime().getSecond());
-                    eveningEndTime = recordTime.withHour(ruleDetails.getEveningEndTime().getHour())
-                            .withMinute(ruleDetails.getEveningEndTime().getMinute())
-                            .withSecond(ruleDetails.getEveningEndTime().getSecond());
-                }
                 if(status == 1){//出
                     if(recordTime.isBefore(amEndTime) && recordTime.isAfter(amStartTime)){
                         attendanceStatus = "早退";
                     }else if(recordTime.isBefore(pmEndTime) && recordTime.isAfter(pmStartTime)){
                         attendanceStatus = "早退";
-                    }else if(recordTime.isBefore(eveningEndTime) && recordTime.isAfter(eveningStartTime)){
-                        attendanceStatus = "早退";
                     }else{
                         attendanceStatus = "离校";
                     }
@@ -174,8 +164,6 @@ public class Out_In_RecordUtil {
                         attendanceStatus = "迟到";
                     }else if(recordTime.isBefore(pmEndTime) && recordTime.isAfter(pmStartTime)){
                         attendanceStatus = "迟到";
-                    }else if(recordTime.isBefore(eveningEndTime) && recordTime.isAfter(eveningStartTime)){
-                        attendanceStatus = "迟到";
                     }else{
                         attendanceStatus = "到校";
                     }

+ 3 - 0
src/main/resources/mapper/base/BaseClass.xml

@@ -92,5 +92,8 @@
         AND c1.class_id = t1.id AND c1.archives_status = 'FB2901' AND c1.stduy_status = 'FB3002') AS not_stay_count FROM base_class t1
         LEFT JOIN xjr_user t2 ON t1.teacher_id = t2.id
         WHERE t1.delete_mark = 0
+        <if test="dto.classId != null">
+            and t1.id = #{dto.classId}
+        </if>
     </select>
 </mapper>