tommy 1 неделю назад
Родитель
Сommit
d50642a7a1
3 измененных файлов: 7 добавлений и 0 удалений
  1. +4
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/entity/TruckLaneRenameLog.kt
  2. +2
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckLaneRenameService.kt
  3. +1
    -0
      src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/TruckLaneRenameModels.kt

+ 4
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/entity/TruckLaneRenameLog.kt Просмотреть файл

@@ -29,4 +29,8 @@ open class TruckLaneRenameLog : BaseEntity<Long>() {


@Column(name = "ticketCount", nullable = false) @Column(name = "ticketCount", nullable = false)
open var ticketCount: Int = 0 open var ticketCount: Int = 0

/** `truck.id` of each shop row in the renamed lane, comma-separated, ascending. */
@Column(name = "truckIds", columnDefinition = "TEXT")
open var truckIds: String? = null
} }

+ 2
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/service/TruckLaneRenameService.kt Просмотреть файл

@@ -91,6 +91,7 @@ open class TruckLaneRenameService(
log.oldDepartureTime = oldTimeLabel log.oldDepartureTime = oldTimeLabel
log.newDepartureTime = if (req.departureTimeChanged) newTime.toString() else oldTimeLabel log.newDepartureTime = if (req.departureTimeChanged) newTime.toString() else oldTimeLabel
log.ticketCount = 0 log.ticketCount = 0
log.truckIds = sourceRows.mapNotNull { it.id }.distinct().sorted().joinToString(",")
renameLogRepository.save(log) renameLogRepository.save(log)


return RenameTruckLaneResponse( return RenameTruckLaneResponse(
@@ -130,6 +131,7 @@ open class TruckLaneRenameService(
oldDepartureTime = row.oldDepartureTime, oldDepartureTime = row.oldDepartureTime,
newDepartureTime = row.newDepartureTime, newDepartureTime = row.newDepartureTime,
ticketCount = row.ticketCount, ticketCount = row.ticketCount,
truckIds = row.truckIds,
) )
} }




+ 1
- 0
src/main/java/com/ffii/fpsms/modules/pickOrder/web/models/TruckLaneRenameModels.kt Просмотреть файл

@@ -40,4 +40,5 @@ data class TruckLaneRenameLogResponse(
val oldDepartureTime: String? = null, val oldDepartureTime: String? = null,
val newDepartureTime: String? = null, val newDepartureTime: String? = null,
val ticketCount: Int = 0, val ticketCount: Int = 0,
val truckIds: String? = null,
) )

Загрузка…
Отмена
Сохранить