multiple committees filter, status reviewed filter

appKom · Dec 24, 2024 · a3edc41 · a3edc41
1 parent 47306ef
commit a3edc41
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/...lin/com/example/autobank/repository/receipt/specification/ReceiptInfoViewSpecification.kt b/...lin/com/example/autobank/repository/receipt/specification/ReceiptInfoViewSpecification.kt
@@ -19,12 +19,15 @@ class ReceiptInfoSpecification(
 
         if (status == "NONE") {
             predicates.add(criteriaBuilder.isNull(root.get<String>("latestReviewStatus")))
-        } else if (status != null) {
+        } else if (status == "DONE") {
+            predicates.add(criteriaBuilder.isNotNull(root.get<String>("latestReviewStatus")))
+        }else if (status != null) {
             predicates.add(criteriaBuilder.equal(root.get<String>("latestReviewStatus"), status))
         }
 
         if (committeeName != null) {
-            predicates.add(criteriaBuilder.equal(root.get<String>("committeeName"), committeeName))
+            val committeeNames = committeeName.split(",").map { it.trim() }
+            predicates.add(root.get<String>("committeeName").`in`(committeeNames))
         }
 
         if (search != null) {