diff --git a/src/main/java/com/utopiaindustries/controller/StitchingController.java b/src/main/java/com/utopiaindustries/controller/StitchingController.java index b54bc11..8930c48 100644 --- a/src/main/java/com/utopiaindustries/controller/StitchingController.java +++ b/src/main/java/com/utopiaindustries/controller/StitchingController.java @@ -93,13 +93,13 @@ public class StitchingController { @RequestParam( value = "sku", required = false ) String sku, @RequestParam( value = "start-date", required = false) String startDate, @RequestParam( value = "end-date", required = false ) String endDate, - @RequestParam(value = "bundle-id", required = false) Long bundleID, + @RequestParam(value = "bundle-id", required = false) Long bundleId, @RequestParam( value = "count", required = false, defaultValue = "100") Long count, Model model ,RedirectAttributes redirect){ LocalDate startDate1 = StringUtils.isNullOrEmpty(startDate) ? LocalDate.now().minusDays(30) : LocalDate.parse(startDate); LocalDate endDate1 = StringUtils.isNullOrEmpty(endDate) ? LocalDate.now() : LocalDate.parse(endDate); - List itemList = bundleService.getStitchedOfflineItems( id, itemId, sku, startDate, endDate, bundleID ,count ); + List itemList = bundleService.getStitchedOfflineItems( id, itemId, sku, startDate, endDate, bundleId ,count ); model.addAttribute("items", itemList ) ; model.addAttribute("startDate", startDate1); model.addAttribute("endDate", endDate1); diff --git a/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java b/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java index 453498d..b86c9d7 100644 --- a/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java +++ b/src/main/java/com/utopiaindustries/querybuilder/ctp/StichedOfflineItemQueryBuilder.java @@ -8,7 +8,7 @@ import java.time.LocalDate; public class StichedOfflineItemQueryBuilder { - public static String buildQuery(String id, String itemId, String sku, String createdStartDate, String createdEndDate, Long bundleID, Long count) { + public static String buildQuery(String id, String itemId, String sku, String createdStartDate, String createdEndDate, Long bundleId, Long count) { // format date String formattedDate; String formattedEndDate; @@ -35,7 +35,7 @@ public class StichedOfflineItemQueryBuilder { .and() .columnEquals("item_id", itemId ) .and() - .columnEquals("bundle_id", bundleID ) + .columnEquals("bundle_id", bundleId ) .and() .columnEqualToOrGreaterThan("created_at", startDate1) .and() diff --git a/src/main/java/com/utopiaindustries/service/BundleService.java b/src/main/java/com/utopiaindustries/service/BundleService.java index 8cc618b..fcd1fdc 100644 --- a/src/main/java/com/utopiaindustries/service/BundleService.java +++ b/src/main/java/com/utopiaindustries/service/BundleService.java @@ -125,13 +125,13 @@ public class BundleService { /* * find finished Items by params * */ - public List getStitchedOfflineItems(String id, String itemId, String sku, String createdStartDate, String createdEndDate, Long bundleID, Long count ){ + public List getStitchedOfflineItems(String id, String itemId, String sku, String createdStartDate, String createdEndDate, Long bundleId, Long count ){ List stitchingOfflineItems = new ArrayList<>(); if( count == null ){ count = 100L; } - if( StringUtils.isAnyNotNullOrEmpty(id, itemId, sku, createdStartDate, createdEndDate, String.valueOf(bundleID) ) ){ - String query = StichedOfflineItemQueryBuilder.buildQuery( id, itemId, sku, createdStartDate, createdEndDate, bundleID , count ); + if( StringUtils.isAnyNotNullOrEmpty(id, itemId, sku, createdStartDate, createdEndDate, String.valueOf(bundleId) ) ){ + String query = StichedOfflineItemQueryBuilder.buildQuery( id, itemId, sku, createdStartDate, createdEndDate, bundleId , count ); System.out.println( query ); stitchingOfflineItems = stitchingOfflineItemDAO.findByQuery( query ); } else { diff --git a/src/main/resources/templates/cutting/bundles.html b/src/main/resources/templates/cutting/bundles.html index f61f5c5..dc998c1 100644 --- a/src/main/resources/templates/cutting/bundles.html +++ b/src/main/resources/templates/cutting/bundles.html @@ -18,7 +18,7 @@
- +
diff --git a/src/main/resources/templates/cutting/master-bundles.html b/src/main/resources/templates/cutting/master-bundles.html index 0e32bf5..8531518 100644 --- a/src/main/resources/templates/cutting/master-bundles.html +++ b/src/main/resources/templates/cutting/master-bundles.html @@ -19,7 +19,7 @@
ID
+ data-order="[[ 0, "desc" ]]"> diff --git a/src/main/resources/templates/stitching/stitched-offline-items.html b/src/main/resources/templates/stitching/stitched-offline-items.html index aa3a619..d6e5a91 100644 --- a/src/main/resources/templates/stitching/stitched-offline-items.html +++ b/src/main/resources/templates/stitching/stitched-offline-items.html @@ -20,7 +20,7 @@
+ data-order="[[ 0, "desc" ]]">
ID