From 28125b2d450c8eb6f04410f12bdbc33b51a5ebd6 Mon Sep 17 00:00:00 2001
From: leoho2fi <leo.ho@2fi-solutions.com.hk>
Date: Mon, 20 May 2024 17:27:58 +0800
Subject: [PATCH] bug fix

---
 src/main/java/com/ffii/tsms/modules/project/entity/Project.kt | 2 +-
 .../com/ffii/tsms/modules/project/entity/ProjectRepository.kt | 4 ++--
 .../java/com/ffii/tsms/modules/report/web/ReportController.kt | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ffii/tsms/modules/project/entity/Project.kt b/src/main/java/com/ffii/tsms/modules/project/entity/Project.kt
index 54c7c37..3358712 100644
--- a/src/main/java/com/ffii/tsms/modules/project/entity/Project.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/entity/Project.kt
@@ -118,4 +118,4 @@ open class Project : BaseEntity<Long>() {
 
     @Column(name = "isClpProject")
     open var isClpProject: Boolean? = null
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ffii/tsms/modules/project/entity/ProjectRepository.kt b/src/main/java/com/ffii/tsms/modules/project/entity/ProjectRepository.kt
index dbad99f..549cf48 100644
--- a/src/main/java/com/ffii/tsms/modules/project/entity/ProjectRepository.kt
+++ b/src/main/java/com/ffii/tsms/modules/project/entity/ProjectRepository.kt
@@ -18,7 +18,7 @@ interface ProjectRepository : AbstractRepository<Project, Long> {
 
     fun findFirstByIsClpProjectAndIdIsNotOrderByIdDesc(isClpProject: Boolean, id: Serializable?): Project?
 
-    fun findAllByPlanStartLessThanEqualAndPlanEndGreaterThanEqual(remainedDateFrom: LocalDate?, remainedDateTo: LocalDate?)
+    fun findAllByPlanStartLessThanEqualAndPlanEndGreaterThanEqual(remainedDateFrom: LocalDate?, remainedDateTo: LocalDate?):List<Project>
 
-    fun findAllByDateRange(start: LocalDate, end: LocalDate): List<Project>
+    //fun findAllByDateRange(start: LocalDate, end: LocalDate): List<Project>
 }
\ No newline at end of file
diff --git a/src/main/java/com/ffii/tsms/modules/report/web/ReportController.kt b/src/main/java/com/ffii/tsms/modules/report/web/ReportController.kt
index 4ff3f7a..11f16de 100644
--- a/src/main/java/com/ffii/tsms/modules/report/web/ReportController.kt
+++ b/src/main/java/com/ffii/tsms/modules/report/web/ReportController.kt
@@ -141,7 +141,7 @@ fun downloadLateStartReport(@RequestBody @Valid request: LateStartReportRequest)
         val customer = customerRepository.findByName(request.customer).orElseThrow()
         //  ?: throw Exception("Customer not found with name: ${request.customer}")
     
-        val projects = projectRepository.findAllByDateRange(request.remainedDateFrom, request.remainedDateTo)
+        val projects = projectRepository.findAllByPlanStartLessThanEqualAndPlanEndGreaterThanEqual(request.remainedDateFrom, request.remainedDateTo)
         if (projects.isEmpty()) {
             throw Exception("No projects found for the given date: ${request.reportDate}")
         }