rodič
revize
15f66b4404
2 změnil soubory, kde provedl 15 přidání a 3 odebrání
  1. +13
    -0
      src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt
  2. +2
    -3
      src/main/java/com/ffii/fpsms/py/PyController.kt

+ 13
- 0
src/main/java/com/ffii/fpsms/modules/jobOrder/entity/JobOrderRepository.kt Zobrazit soubor

@@ -120,6 +120,19 @@ interface JobOrderRepository : AbstractRepository<JobOrder, Long> {

fun findByDeletedFalseAndPlanStartBetweenOrderByIdAsc(planStartStart: LocalDateTime, planStartEnd: LocalDateTime): List<JobOrder>

@Query(
"""
SELECT jo FROM JobOrder jo
WHERE jo.deleted = false
AND jo.planStart >= :planStartFrom
AND jo.planStart < :planStartToExclusive
ORDER BY jo.id ASC
"""
)
fun findByDeletedFalseAndPlanStartFromBeforeExclusiveOrderByIdAsc(
planStartFrom: LocalDateTime,
planStartToExclusive: LocalDateTime,
): List<JobOrder>

@Query("""
SELECT jo FROM JobOrder jo


+ 2
- 3
src/main/java/com/ffii/fpsms/py/PyController.kt Zobrazit soubor

@@ -10,7 +10,6 @@ import org.springframework.web.bind.annotation.RequestParam
import org.springframework.web.bind.annotation.RestController
import java.time.LocalDate
import java.time.LocalDateTime
import java.time.LocalTime

/**
* Public API for Python clients. No login required.
@@ -34,8 +33,8 @@ open class PyController(
): ResponseEntity<List<PyJobOrderListItem>> {
val date = planStart ?: LocalDate.now()
val dayStart = date.atStartOfDay()
val dayEnd = date.atTime(LocalTime.MAX)
val orders = jobOrderRepository.findByDeletedFalseAndPlanStartBetweenOrderByIdAsc(dayStart, dayEnd)
val dayEndExclusive = date.plusDays(1).atStartOfDay()
val orders = jobOrderRepository.findByDeletedFalseAndPlanStartFromBeforeExclusiveOrderByIdAsc(dayStart, dayEndExclusive)
val list = orders.map { jo -> toListItem(jo) }
return ResponseEntity.ok(list)
}


Načítá se…
Zrušit
Uložit