Merge remote-tracking branch 'origin/dev' into dev

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

@@ -51,6 +51,9 @@ public class VehicleBookRecordQueryVo extends PageParam {
      */
     private Integer bookType;
 
+    //是否需要过滤数据，默认限制
+    private boolean flag = true;
+
     private Integer companyId;
 
     private List<Integer> companyIds;

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

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.common.RestResponse;
@@ -398,4 +399,16 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
      return  mapper.getList();
     }
 
+    public ObjectRestResponse branchCompans() {
+        UserDTO userDTO = getAdminUserInfo();
+        List<BranchCompany> list;
+        if (userDTO != null&&userDTO.getDataAll() == DATA_ALL_FALSE) {
+            List<Integer> branchCompanies = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+            list = mapper.selectByIdList(branchCompanies);
+        }else {
+            list=getAll();
+        }
+        return  ObjectRestResponse.succ(list);
+    }
+
 }

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

@@ -202,7 +202,10 @@ public class VehicleActiveService {
         }
         if (MileageRest != null && MileageRest1 >= MileageRest) {
             VehicleBookRecord vehicleBookRecord = null;
-
+            if (arrivalVo.getBookRecordId() != null) {
+                vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
+                updateBookRecordStatus(vehicleBookRecord, 2);
+            }
             // 写入车辆公里数,还车分公司id
             vehicle.setMileageLastUpdate(MileageRest1);
             if (vehicleBookRecord != null) {
@@ -260,10 +263,7 @@ public class VehicleActiveService {
             } else if (actualArrivalDate.compareTo(arrivalDate) > 0) {//实际还车时间大于预计还车时间
                 vehicleBookRecord.setRemark(vehicleBookRecord.getRemark() + "  用户延期还车，实际占用日期");
             }
-            if (arrivalVo.getBookRecordId() != null) {
-                vehicleBookRecord = vehicleBookRecordBiz.selectById(arrivalVo.getBookRecordId());
-                updateBookRecordStatus(vehicleBookRecord, 2);
-            }
+            updateBookRecordStatus(vehicleBookRecord, 2);
             departureLog.setMileageEnd(arrivalVo.getMileage());
             departureLog.setRecycleMan(arrivalVo.getRecycleMan());
             departureLog.setRecycleManTel(arrivalVo.getRecycleManTel());

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

@@ -249,6 +249,7 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             Iterator<VehicleBookRecordVo> iterator = list.iterator();
             while (iterator.hasNext()) {
                 VehicleBookRecordVo vehicleBookRecordVo = iterator.next();
+                //已出车记录
                 if (vehicleBookRecordVo.getVehicleDepartureLogVo() != null) {
                     iterator.remove();
                 }

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

@@ -10,9 +10,13 @@ import com.xxfc.platform.vehicle.mapper.VehicleUserReserveMapper;
 import com.xxfc.platform.vehicle.pojo.dto.VehicleUserReserveDTO;
 import com.xxfc.platform.vehicle.pojo.vo.VehicleUserReserveVo;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
 
 
 @Service
@@ -30,7 +34,24 @@ public class VehicleUserReserveBiz extends BaseBiz<VehicleUserReserveMapper, Veh
         if (reserveDTO.getLimit()!=null&&reserveDTO.getLimit()>0){
             limit=reserveDTO.getLimit();
         }
-        return  ObjectRestResponse.succ(PageDataVO.pageInfo(page, limit, ()->mapper.getList(reserveDTO,userId)));
+
+        PageDataVO<VehicleUserReserveVo> dataVO = PageDataVO.pageInfo(page, limit, () -> mapper.getList(reserveDTO, userId));
+        if (CollectionUtils.isEmpty(dataVO.getData())){
+             dataVO.setData(Collections.EMPTY_LIST);
+             dataVO.setPageNum(reserveDTO.getPage());
+             dataVO.setPageSize(reserveDTO.getLimit());
+            return ObjectRestResponse.succ(dataVO);
+        }
+        List<VehicleUserReserveVo> data = dataVO.getData();
+        for (VehicleUserReserveVo userReserveVo : data) {
+            String vehiclePic = userReserveVo.getVehiclePic();
+            if (StringUtils.isNotEmpty(vehiclePic)){
+                String[] imgs = vehiclePic.split(",");
+                userReserveVo.setVehiclePic(imgs[0]);
+            }
+        }
+        dataVO.setData(data);
+        return  ObjectRestResponse.succ(dataVO);
     }
 
     //新增预定

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

@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -211,4 +212,9 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
         PageDataVO<BranchCompanyListVO> pageDataVO = baseBiz.findBranchCompanyWithPage(branchCompanyFindDTO);
         return pageDataVO;
     }
+
+    @RequestMapping(value ="/companys",method = RequestMethod.GET)
+    public ObjectRestResponse<List<BranchCompany>> companys() {
+        return baseBiz.branchCompans();
+    }
 }

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

@@ -502,7 +502,16 @@
             <if test="code != null">
                 and v3.code = #{code}
             </if>
-            and v1.book_user != -2 and book_end_date &gt;= now()
+            <!--增加时间限制，未审核的小于当前时间的不显示-->
+            <if test="flag == true and status == 1">
+                and book_end_date &gt;= now()
+            </if>
+            <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间后两天的不显示-->
+            <if test="flag == true and (status == 2 || status == 3 || status == 5)">
+                and ((v4.id is not NULL and v1.book_end_date &gt;= DATE_ADD(NOW(),interval '2 00:00:00' DAY_SECOND)) or
+                (v4.id is NULL and v1.book_end_date &gt;= now()))
+            </if>
+            and v1.book_user != -2
         </where>
         group by v1.id
         order by create_time DESC

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

@@ -17,16 +17,16 @@
         r.addr_city AS addrCity,
         r.city_name AS cityName,
         r.company_id AS companyId,
-        CONCAT(bct.province_name,bct.city_name,bct.town_name,bct.addr_detail) AS `companyAddress`,
+        CONCAT(IFNULL(bct.province_name," "),IFNULL(bct.city_name," "),IFNULL(bct.town_name," "),IFNULL(bct.addr_detail," ")) AS `companyAddress`,
         r.arrival_companyId AS arrivalCompanyId,
-        CONCAT(bcr.province_name,bcr.city_name,bcr.town_name,bcr.addr_detail) AS `arrivalcompanyAddress`,
+        CONCAT(IFNULL(bcr.province_name," "),IFNULL(bcr.city_name," "),IFNULL(bcr.town_name," "),IFNULL(bcr.addr_detail," ")) AS `arrivalcompanyAddress`,
         bct.NAME AS `companyName`,
         bcr.NAME AS `arrivalCompanyName`,
         r.crt_time AS crtTime,
         r.upd_time AS updTime,
         r.`status`,
         m.`name` AS modelName,
-        m.`cover_pic` AS `vehiclePic`
+        m.`picture` AS `vehiclePic`
         FROM
         vehicle_user_reserve r
         LEFT JOIN vehicle_model m ON r.mode_id = m.id