123

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/RandomListController.java

+package com.xxfc.platform.uccn.rest;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.uccn.biz.RandomListBiz;
+import com.xxfc.platform.uccn.dto.RandomListDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequestMapping("/random/list")
+public class RandomListController {
+    @Autowired
+    RandomListBiz randomListBiz;
+
+    @GetMapping("/get")
+    public ObjectRestResponse getRandomList(RandomListDto randomListDto) {
+        if(randomListDto == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        return randomListBiz.getRandomList(randomListDto.getType(), randomListDto.getNumber(), randomListDto.getLocation());
+    }
+
+}

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -311,7 +311,7 @@ public class VehicleActiveService {
                 if(list != null && list.size() > 0) {
                     Iterator<VehicleBookRecordVo> iterator = list.iterator();
                     while (iterator.hasNext()) {
-                        if(iterator.next().getVehicleDepartureLogVo() == null && iterator.next().getBookEndDate().after(new Date())) {
+                        if(iterator.next().getVehicleDepartureLogVo() == null && iterator.next().getBookEndDate().before(new Date())) {
                             iterator.remove();
                         }
                     }