Explorar o código

解决访客列表查询确实的问题

dzx hai 1 ano
pai
achega
38cf62683b

+ 2 - 2
src/main/java/com/xjrsoft/module/attendance/controller/StatisticsController.java

@@ -140,10 +140,10 @@ public class StatisticsController {
             DateTimeFormatter formatter = DateTimeFormatter.ISO_DATE;
             LocalDate queryDate = LocalDate.parse(dto.getDate(), formatter);
             LocalDateTime startTime, endTime;
-            if(dto.getTimePeriod() == 1){
+            if(dto.getTimePeriod() != null && dto.getTimePeriod() == 1){
                 startTime = queryDate.atTime(9, 0, 0);
                 endTime = queryDate.atTime(12, 0, 0);
-            }else if(dto.getTimePeriod() == 2){
+            }else if(dto.getTimePeriod() != null && dto.getTimePeriod() == 2){
                 startTime = queryDate.atTime(12, 0, 0);
                 endTime = queryDate.atTime(18, 0, 0);
             }else{

+ 4 - 1
src/main/resources/mapper/personnel/ReservationSchoolMapper.xml

@@ -9,7 +9,10 @@
         LEFT JOIN xjr_user t3 ON t2.respondent_user_id = t3.id
         LEFT JOIN xjr_department t4 ON t2.dept_id = t4.id
         WHERE t1.delete_mark = 0 AND t2.delete_mark = 0 AND t2.status = 1
-        AND #{date} between start_time and end_time
+        AND (
+            (#{date} between start_time and end_time) or
+             (#{date} between  DATE_FORMAT(start_time, '%Y-%m-%d') and DATE_FORMAT(start_time, '%Y-%m-%d'))
+            )
     </select>
 
 </mapper>