Compare commits

..

No commits in common. "fe75d590b9381c4ca750f54e6fa058925b985d9c" and "dd08b68454ac7a4067c5d02b09553940b6664850" have entirely different histories.

2 changed files with 7 additions and 7 deletions

View File

@ -20,8 +20,8 @@ public interface CheckTicketRepository extends MongoRepository<CheckTicket,Strin
@Query("{'checktickettime':{'$gte': ?0, '$lt': ?1},'checkticketdate':{'$dt': ?2}}") @Query("{'checktickettime':{'$gte': ?0, '$lt': ?1},'checkticketdate':{'$dt': ?2}}")
List<CheckTicket> findByTimestampBetweenAndCheckticketdate(String startTime, String endTime,String day); List<CheckTicket> findByTimestampBetweenAndCheckticketdate(String startTime, String endTime,String day);
Long countByCheckticketdateAndChecktickettimeBetween(String day,String startTime, String endTime); List<CheckTicket> findByCheckticketdateAndChecktickettimeBetween(String day,String startTime, String endTime);
// @Query("{'checkticketdate':{'$gte': ?0, '$lt': ?1} , 'checktickettime':{'$gte': ?2, '$lt': ?3}}") @Query("{'checkticketdate':{'$gte': ?0, '$lt': ?1} , 'checktickettime':{'$gte': ?2, '$lt': ?3}}")
Long countByCheckticketdateBetweenAndChecktickettimeBetween(String startTime, String endTime,String beingTime, String resultTime); List<CheckTicket> findByCheckticketdateBetweenAndChecktickettimeBetween(String startTime, String endTime,String beingTime, String resultTime);
} }

View File

@ -41,14 +41,14 @@ public class CheckTicketServiceImpl implements CheckTicketService {
LocalDateTime hourEndTime = hourStartTime.plusHours(1); LocalDateTime hourEndTime = hourStartTime.plusHours(1);
String begintime = formatter.format(hourStartTime); String begintime = formatter.format(hourStartTime);
String resulttime = formatter.format(hourEndTime); String resulttime = formatter.format(hourEndTime);
Long checkTickets; List<CheckTicket> checkTickets;
if (starTime != null && endTime != null && starTime.equals(endTime)){ if (starTime != null && endTime != null && starTime.equals(endTime)){
checkTickets = checkTicketRepository.countByCheckticketdateAndChecktickettimeBetween(starTime,begintime,resulttime); checkTickets = checkTicketRepository.findByCheckticketdateAndChecktickettimeBetween(starTime,begintime,resulttime);
}else { }else {
checkTickets = checkTicketRepository.countByCheckticketdateBetweenAndChecktickettimeBetween(starTime,endTime,begintime,resulttime); checkTickets = checkTicketRepository.findByCheckticketdateBetweenAndChecktickettimeBetween(starTime,endTime,begintime,resulttime);
} }
map.put("date",begintime+"-"+resulttime); map.put("date",begintime+"-"+resulttime);
map.put("count", String.valueOf(checkTickets)); map.put("count", String.valueOf(checkTickets.stream().count()));
mapList.add(map); mapList.add(map);
} }