添加根据预定记录ID获取出行记录接口

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

@@ -29,7 +29,6 @@ import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.beanutils.PropertyUtils;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.T;
 import org.joda.time.DateTime;
 import org.joda.time.format.DateTimeFormat;
 import org.joda.time.format.DateTimeFormatter;
@@ -195,51 +194,6 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
         vehicleBookRecordQueryVo.setCompanyIds(companyList);
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 3) { //待出行
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query = new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus3(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 5) { //出行中
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query = new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus5(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
-        if (vehicleBookRecordQueryVo.getStatus() != null && vehicleBookRecordQueryVo.getStatus() == 7) { //已完成
-            vehicleBookRecordQueryVo.setStatus(2);
-            Query query =  new Query(vehicleBookRecordQueryVo);
-            List<VehicleBookRecordVo> list = mapper.getBookRecordInfo(query.getSuper());
-            removeStatus7(list);
-            PageInfo<VehicleBookRecordVo> vehicleBookRecordVoPageInfo = new PageInfo<>(list);
-            getupKeeps(vehicleBookRecordVoPageInfo.getList());
-            PageDataVO<VehicleBookRecordVo> vehicleBookRecordVoPageDataVO = PageDataVO.pageInfo(vehicleBookRecordVoPageInfo);
-            vehicleBookRecordVoPageDataVO.setPageNum(pageNo);
-            vehicleBookRecordVoPageDataVO.setPageSize(pageSize);
-            vehicleBookRecordVoPageDataVO.setTotalCount((long) vehicleBookRecordVoPageInfo.getList().size());
-            vehicleBookRecordVoPageDataVO.setTotalPage((vehicleBookRecordVoPageInfo.getList().size() + pageSize - 1) / pageSize);
-            vehicleBookRecordVoPageDataVO.setData(getData(vehicleBookRecordVoPageInfo.getList(), pageNo, pageSize));
-            return RestResponse.suc(vehicleBookRecordVoPageDataVO);
-        }
         Query query =  new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         getupKeeps(pageDataVO.getData());
@@ -259,47 +213,6 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             }
         }
     }
-
-    //筛选未出车的记录
-    public void removeStatus3(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(3);
-            }
-        }
-    }
-
-    //筛选已出车未还车记录
-    public void removeStatus5(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() ==1)) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(5);
-            }
-        }
-    }
-    //筛选已完成记录
-    public void removeStatus7(List<VehicleBookRecordVo> list) {
-        if (list != null && list.size() > 0) {
-            Iterator<VehicleBookRecordVo> iterator = list.iterator();
-            while (iterator.hasNext()) {
-                VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
-                if (vehicleBookRecordVo.getVehicleDepartureLogVo() == null || (vehicleBookRecordVo.getVehicleDepartureLogVo() != null && vehicleBookRecordVo.getVehicleDepartureLogVo().getState() !=1)) {
-                    iterator.remove();
-                }
-                vehicleBookRecordVo.setState(5);
-            }
-        }
-    }
     /**
      * 获取随身物品
      */

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

@@ -490,9 +490,18 @@
                     #{id}
                 </foreach>)
             </if>
-            <if test="status != null and status != 0 and status != -1 and status != -2">
+            <if test="status != null and status != 0 and status != -1 and status != -2 and status != 3 and status != 5 and status != 7">
                 and v1.status = #{status}
             </if>
+            <if test="status != null and status == 3 ">
+                and v4.id is null and v1.status = 2
+            </if>
+            <if test="status != null and status == 5 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 0
+            </if>
+            <if test="status != null and status == 7 ">
+                and v4.id is not null and v1.status = 2 and v4.state = 1
+            </if>
             <if test="status != null and status == 0 ">
                 and v4.state = 0
             </if>