DO Update (filter)

src/main/java/com/ffii/fpsms/modules/deliveryOrder/entity/DeliveryOrderRepository.kt

@@ -2,10 +2,12 @@ package com.ffii.fpsms.modules.deliveryOrder.entity
 
 import com.ffii.core.support.AbstractRepository
 import com.ffii.fpsms.modules.deliveryOrder.entity.models.DeliveryOrderInfo
+import com.ffii.fpsms.modules.deliveryOrder.enums.DeliveryOrderStatus
 import com.ffii.fpsms.modules.master.entity.projections.SearchId
 import org.springframework.data.jpa.repository.Query
 import org.springframework.stereotype.Repository
 import java.io.Serializable
+import java.time.LocalDateTime
 
 @Repository
 interface DeliveryOrderRepository : AbstractRepository<DeliveryOrder, Long> {
@@ -17,9 +19,15 @@ interface DeliveryOrderRepository : AbstractRepository<DeliveryOrder, Long> {
 
     fun findAllByCodeAndDeletedIsFalse(code: String): List<DeliveryOrderInfo>
 
+    fun findAllByShopNameAndDeletedIsFalse(shopName: String): List<DeliveryOrderInfo>
 
+    fun findAllByStatusAndDeletedIsFalse(status: DeliveryOrderStatus): List<DeliveryOrderInfo>
 
+    fun findByOrderDateBetweenAndDeletedIsFalse(start: LocalDateTime?, end: LocalDateTime?) : List<DeliveryOrderInfo>
 
+    fun findAllByCodeContainsAndShopNameContainsAndStatusAndOrderDateBetween(code: String?, shopName: String?, status: DeliveryOrderStatus?, startDate: LocalDateTime?, endDate: LocalDateTime?) : List<DeliveryOrderInfo>
 
+    fun findAllByCodeContainsAndShopNameContainsAndStatus(code: String?, shopName: String?, status: DeliveryOrderStatus?): List<DeliveryOrderInfo>;
 
+    fun findAllBy() : List<DeliveryOrderInfo>;
 }

src/main/java/com/ffii/fpsms/modules/deliveryOrder/enums/DeliveryOrderEnum.kt

@@ -3,5 +3,5 @@ package com.ffii.fpsms.modules.deliveryOrder.enums
 enum class DeliveryOrderStatus(val value: String) {
     PENDING("pending"),
     RECEIVING("receiving"),
-    COMPLETED("completed");
+    COMPLETED("completed"),
 }

src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DeliveryOrderService.kt

@@ -28,6 +28,8 @@ import com.ffii.fpsms.modules.pickOrder.service.PickOrderService
 import java.time.LocalDate
 import java.math.BigDecimal
 import com.ffii.fpsms.modules.master.web.models.MessageResponse
+import java.time.LocalDateTime
+
 @Service
 open class DeliveryOrderService(
     private val deliveryOrderRepository: DeliveryOrderRepository,
@@ -82,6 +84,26 @@ open class DeliveryOrderService(
         return deliveryOrderRepository.findAllByCodeAndDeletedIsFalse(code);
     }
 
+    open fun searchByShopName(shopName: String) : List<DeliveryOrderInfo> {
+        return deliveryOrderRepository.findAllByShopNameAndDeletedIsFalse(shopName);
+    }
+
+    open fun searchByStatus(status: DeliveryOrderStatus): List<DeliveryOrderInfo> {
+        return deliveryOrderRepository.findAllByStatusAndDeletedIsFalse(status);
+    }
+
+    open fun searchBetweenOrderDate(start: LocalDateTime?, end: LocalDateTime?): List<DeliveryOrderInfo> {
+        return deliveryOrderRepository.findByOrderDateBetweenAndDeletedIsFalse(start, end);
+    }
+
+    open fun searchDO(code: String?, shopName: String?, status: DeliveryOrderStatus?, startDate: LocalDateTime?, endDate: LocalDateTime?):List<DeliveryOrderInfo> {
+        if(status == null || startDate == null || endDate ==null){
+            return deliveryOrderRepository.findAllBy();
+        }
+        return deliveryOrderRepository.findAllByCodeContainsAndShopNameContainsAndStatusAndOrderDateBetween(code, shopName, status, startDate, endDate);
+    }
+
+
 
     open fun updateDeliveryOrderStatus(request: SaveDeliveryOrderStatusRequest): SaveDeliveryOrderResponse {
         val deliveryOrder = checkNotNull(

src/main/java/com/ffii/fpsms/modules/deliveryOrder/web/DeliveryOrderController.kt

@@ -18,6 +18,8 @@ import com.ffii.fpsms.modules.deliveryOrder.web.models.DoDetailResponse
 import com.ffii.fpsms.modules.deliveryOrder.web.models.ReleaseDoRequest
 import com.ffii.fpsms.modules.master.web.models.MessageResponse
 import jakarta.validation.Valid
+import java.time.LocalDateTime
+
 @RequestMapping("/do")
 @RestController
 class DeliveryOrderController(
@@ -34,10 +36,32 @@ class DeliveryOrderController(
     }
 
     @GetMapping("/search-code/{code}")
-    fun searchByCode(@PathVariable code: String): List<DeliveryOrderInfo>{
+    fun searchByCode(@PathVariable code: String): List<DeliveryOrderInfo> {
         return deliveryOrderService.searchByCode(code);
     }
 
+    @GetMapping("/search-shopname/{shopName}")
+    fun searchByShopName(@PathVariable shopName: String): List<DeliveryOrderInfo> {
+        return deliveryOrderService.searchByShopName(shopName);
+    }
+
+    @GetMapping("/search-status/{status}")
+    fun searchByStatus(@PathVariable status: DeliveryOrderStatus): List<DeliveryOrderInfo> {
+        return deliveryOrderService.searchByStatus(status);
+    }
+
+    @GetMapping("/search-orderdate/{start}&{end}")
+    fun searchBetweenOrderDate(@PathVariable start: LocalDateTime?,@PathVariable end: LocalDateTime?): List<DeliveryOrderInfo> {
+        return deliveryOrderService.searchBetweenOrderDate(start, end);
+    }
+
+    @GetMapping("/search-DO/{code}&{shopName}&{status}&{startDate}&{endDate}")
+    fun searchDO(@PathVariable code: String?, @PathVariable shopName: String?, @PathVariable status: DeliveryOrderStatus?, @PathVariable startDate: LocalDateTime? , @PathVariable endDate: LocalDateTime?): List<DeliveryOrderInfo>{
+        return deliveryOrderService.searchDO(code, shopName, status, startDate, endDate);
+    }
+
+
+
     @PostMapping("/update-status")
     fun updateDoStatus(@RequestBody request: SaveDeliveryOrderStatusRequest): SaveDeliveryOrderResponse {
         return deliveryOrderService.updateDeliveryOrderStatus(request);