Merge branch 'master-count-vehicle' into dev

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

@@ -3,6 +3,7 @@ package com.xxfc.platform.vehicle.biz;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.bean.copier.CopyOptions;
 import com.github.wxiaoqi.security.common.exception.BaseException;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.constant.*;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.entity.*;
@@ -19,6 +20,7 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
+import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
 
@@ -456,6 +458,19 @@ public class VehicleActiveService {
 
     }
 
+    public ObjectRestResponse selectDepartureLogByBookRecordId(Long bookRecordId) {
+        if (bookRecordId == null) {
+            return ObjectRestResponse.paramIsEmpty();
+        }
+        Example example = new Example(VehicleDepartureLog.class);
+        example.createCriteria().andEqualTo("bookRecordId", bookRecordId);
+       VehicleDepartureLog vehicleDepartureLog = vehicleDepartureLogMapper.selectOneByExample(example);
+        if (vehicleDepartureLog == null) {
+            return ObjectRestResponse.createFailedResult(ResCode.FIND_DATA_NOT_EXIST.getCode(), ResCode.FIND_DATA_NOT_EXIST.getDesc());
+        }
+        return ObjectRestResponse.succ(vehicleDepartureLog);
+    }
+
 
     public static void main(String[] args) {
         DateTime startDate = DateTime.parse("2019-08-21 17:00:00", DATE_TIME_FORMATTER);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleActiveController.java

 package com.xxfc.platform.vehicle.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreUserToken;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.biz.VehicleActiveService;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.pojo.*;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.Date;
 
@@ -91,6 +89,12 @@ public class VehicleActiveController {
     }
 
 
+    @GetMapping("/getOne")
+    public ObjectRestResponse selectByRecordId(Long bookRecordId) {
+        return vehicleActiveService.selectDepartureLogByBookRecordId(bookRecordId);
+    }
+
+
 
     /**
      * 保养