Explorar o código

考勤统计调整

dzx hai 1 ano
pai
achega
3ad9c688fe

+ 1 - 0
src/main/java/com/xjrsoft/module/job/AttendanceRecordTask.java

@@ -185,6 +185,7 @@ public class AttendanceRecordTask {
             }
 
             TeacherOutInRecordDto outInDto = new TeacherOutInRecordDto();
+            outInDto.setTimePeriod(timePeriod);
             outInDto.setQueryDate(startTime.toLocalDate());
             outInDto.setEndTime(endTime);
             outInDto.setStartTime(startTime);

+ 3 - 0
src/main/java/com/xjrsoft/module/outint/dto/TeacherOutInRecordDto.java

@@ -46,4 +46,7 @@ public class TeacherOutInRecordDto implements Serializable {
     @ApiModelProperty("海康记录时间")
     private LocalDateTime endTime;
 
+    @ApiModelProperty("时间段:1上午 2下午 3晚上")
+    private Integer timePeriod;
+
 }

+ 9 - 1
src/main/resources/mapper/outin/TeacherOutInRecordMapper.xml

@@ -6,7 +6,15 @@
     <select id="getListByParam" parameterType="com.xjrsoft.module.outint.dto.TeacherOutInRecordDto" resultType="com.xjrsoft.module.outint.entity.TeacherOutInRecord">
         SELECT * FROM teacher_out_in_record
         WHERE delete_mark = 0
-        AND record_time between #{dto.startTime} and #{dto.endTime}
+        <if test="dto.timePeriod == 1">
+            AND #{dto.endTime} >= record_time
+        </if>
+        <if test="dto.timePeriod == 2">
+            AND record_time between #{dto.startTime} and #{dto.endTime}
+        </if>
+        <if test="dto.timePeriod == 3">
+            AND #{dto.endTime} >= record_time
+        </if>
         AND status = #{dto.status}
         AND DATE_FORMAT(record_time, '%Y-%m-%d') = #{dto.queryDate}
         AND user_id = #{dto.userId}