From 218e0087c96083181db8793f235f27ba5bd0651b Mon Sep 17 00:00:00 2001 From: Said Gedik Date: Thu, 15 Jun 2023 11:01:23 +0200 Subject: [PATCH] fixed query --- .../calender/api/KalenderRestController.java | 2 +- .../com/nttdata/calender/planTimes/PlanTimes.java | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java index 6e4e477..dbf7c97 100644 --- a/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java +++ b/backend/src/main/java/com/nttdata/calender/api/KalenderRestController.java @@ -116,7 +116,7 @@ public class KalenderRestController { @CrossOrigin("*") @GetMapping("/api/getPlanTimes") - public Object getPlanTimes(@RequestBody PlanTimesRequest request) { + public Object getPlanTimes(@RequestBody PlanTimesRequest request) throws ARException { PlanTimes p = new PlanTimes(javaAPI); p.setPlanTimes(request); return null; diff --git a/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java b/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java index 3cdc1f5..4e2842d 100644 --- a/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java +++ b/backend/src/main/java/com/nttdata/calender/planTimes/PlanTimes.java @@ -61,13 +61,16 @@ public class PlanTimes { startDate = startDate.with(TemporalAdjusters.next(DayOfWeek.MONDAY)); } - for (var week : calenderWeeks) { - var changesInWeek = remedyJavaAPI.queryFieldsById("\"Geplantes Startdatum\" > \"" + week.getStartDate() + "\" AND \"Geplantes Startdatum\" <= \"" - + week.getEndDate() + "\"", queryChanges.getFieldIds(), formName, null, 0, 0); + System.out.println(remedyJavaAPI.getFieldDatabaseName(formName, 1000000350)); + + var changesInDateRange = remedyJavaAPI.queryFieldsById("\'Scheduled Start Date\' > \"" + req.getRenderStartDate() + "\" AND \'Scheduled Start Date\' <= \"" + + req.getRenderEndDate() + "\"", queryChanges.getFieldIds(), formName, null, 0, 20); - for (var v : changesInWeek) { - System.out.println(v); - } + + for (var c : changesInDateRange) System.out.println(c); + + for (var week : calenderWeeks) { + } /* * for (var c : changes) {