积分规则列表获取问题

ace-common/pom.xml

@@ -111,7 +111,11 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.13</version>
         </dependency>
-
+        <dependency>
+            <groupId>net.logstash.logback</groupId>
+            <artifactId>logstash-logback-encoder</artifactId>
+            <version>5.2</version>
+        </dependency>
         <!-- 公式计算 -->
         <dependency>
             <groupId>org.apache.commons</groupId>

ace-common/src/main/java/com/github/wxiaoqi/security/common/filter/AcceptFilter.java

+package com.github.wxiaoqi.security.common.filter;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.FilterReply;
+
+public class AcceptFilter extends Filter<ILoggingEvent> {
+	@Override
+	public FilterReply decide(ILoggingEvent event) {
+		return event.getLoggerName().startsWith("com.xxfc.platform") ? FilterReply.ACCEPT : FilterReply.DENY;
+	}
+}
\ No newline at end of file

ace-common/src/main/java/com/github/wxiaoqi/security/common/filter/DenyFilter.java

+package com.github.wxiaoqi.security.common.filter;
+
+import ch.qos.logback.classic.spi.ILoggingEvent;
+import ch.qos.logback.core.filter.Filter;
+import ch.qos.logback.core.spi.FilterReply;
+
+public class DenyFilter extends Filter<ILoggingEvent> {
+	@Override
+	public FilterReply decide(ILoggingEvent event) {
+		return event.getLoggerName().startsWith("com.xxfc.platform") ? FilterReply.DENY : FilterReply.ACCEPT;
+	}
+}
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -18,7 +18,6 @@ import com.github.wxiaoqi.security.common.util.ClientUtil;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
@@ -156,7 +155,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @ApiOperation(value = "获取后台订单列表")
     @IgnoreClientToken
     @CrossOrigin
-    public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(QueryOrderList dto, HttpServletRequest request) {
+    public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(QueryOrderList dto) {
         if (dto.getStartTime() != null) {
             if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
@@ -168,17 +167,34 @@ public class BaseOrderController extends CommonBaseController implements UserRes
                 dto.setUserId(appUserLogin.getId());
             }
         }
-
         UserDTO userDTO = getAdminUserInfo();
         if(userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());
         }
-        if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
-            if(StringUtils.isNotBlank(userDTO.getDataZone())) {
-               dto.setStartZoneId(userDTO.getZoneId());
-            }
-            if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
-                dto.setStartCompanyId(userDTO.getCompanyId());
+        if(dto.getStartZoneId() == null) { //默认查出所有权限内的数据
+            if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
+                String zoneId = null;
+                if(StringUtils.isNotBlank(userDTO.getDataZone())) {
+                    if(userDTO.getDataZone().contains(",")) {
+                        zoneId = userDTO.getDataZone();
+                    } else {
+                        zoneId = userDTO.getDataZone() + ",";
+                    }
+                } else {
+                    zoneId = userDTO.getZoneId() + ",";
+                }
+                dto.setZoneIds(zoneId.split(","));
+                String companyId = null;
+                if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
+                    if(userDTO.getDataCompany().contains(",")) {
+                        companyId = userDTO.getDataCompany();
+                    } else {
+                        companyId = userDTO.getDataCompany() + ",";
+                    }
+                } else {
+                    companyId = userDTO.getCompanyId() + ",";
+                }
+                dto.setCompanyIds(companyId.split(","));
             }
         }
         Query query = new Query(dto);
@@ -470,5 +486,9 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         Integer page;
         @ApiModelProperty("每页限制")
         Integer limit;
+
+        String[] companyIds;
+
+        String[] zoneIds;
     }
 }

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -138,13 +138,27 @@
                 and (r.start_time between #{startTime} and #{endTime}
                 or t.start_time between #{startTime} and #{endTime})
             </if>
-            <if test="startCompanyId != null">
-                and ( r.start_company_id = #{startCompanyId}
-                or t.start_company_id = #{startCompanyId})
+            <if test="companyIds != null">
+                and (r.start_company_id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+                or t.start_company_id in
+                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+                )
             </if>
-            <if test="startZoneId != null">
-                and (r.start_zone_id = #{startZoneId}
-                or t.start_zone_id = #{startZoneId})
+            <if test="zoneIds != null">
+                and (r.start_zone_id in
+                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+                or t.start_zone_id in
+                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
+                    #{id}
+                </foreach>
+                )
             </if>
         </where>
         order by b.crt_time desc

xx-vehicle/xx-vehicle-api/pom.xml

@@ -10,7 +10,15 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.xxfc.platform</groupId>
     <artifactId>xx-vehicle-api</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.github.wxiaoqi</groupId>
+            <artifactId>ace-admin-api</artifactId>
+            <version>2.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
 
+    </dependencies>
     <build>
         <plugins>
             <plugin>
@@ -23,9 +31,4 @@
             </plugin>
         </plugins>
     </build>
-    <dependencies>
-
-
-    </dependencies>
-
 </project>
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/constant/BookType.java

@@ -7,8 +7,8 @@ import java.util.Map;
  * 预定车辆用途
  */
 public enum BookType {
-    EMPLOYEE_APPLY(1,"还车"),
-    USER_RENT(2,"租车"),
+    EMPLOYEE_APPLY(2,"用户租赁"),
+    USER_RENT(1,"租车"),
     REPAIRING(3,"维修"),
     SHOW(4,"展览"),
     TOUR(5,"旅游"),

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleBookRecord.java

@@ -4,7 +4,6 @@ import lombok.Data;
 
 import javax.persistence.*;
 import java.util.Date;
-import java.util.List;
 
 @Table(name = "vehicle_book_record")
 @Data
@@ -33,13 +32,13 @@ public class VehicleBookRecord {
     private Integer bookType;
 
     /**
-     * 预定用户id
+     * 申请预定用户id
      */
     @Column(name = "book_user")
     private Integer bookUser;
 
     /**
-     * 预定用户姓名
+     * 申请预定用户姓名
      */
     @Column(name = "book_user_name")
     private String bookUserName;
@@ -181,15 +180,7 @@ public class VehicleBookRecord {
      */
     private String orderNo;
 
-    @Transient
-    private List<String> startHourList;
+    private String vehicleUsername;
 
-    @Transient
-    private List<String> endHourList;
-
-    @Transient
-    private String startHour;
-
-    @Transient
-    private String endHour;
+    private String vehicleUserPhone;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/AdminInfoFeign.java

+package com.xxfc.platform.vehicle.feign;
+
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpServletRequest;
+
+@Component
+public class AdminInfoFeign {
+
+    @Autowired
+    UserFeign userFeign;
+
+    public UserDTO getAdminUserInfo() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        if(request.getHeader("Authorization") !=null) {
+            return userFeign.userinfoByToken(request.getHeader("Authorization")).getData();
+        }
+        return null;
+    }
+}

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

@@ -13,6 +13,8 @@ public class BookVehicleVO {
     @ApiModelProperty("车辆id")
     private String vehicleId;
 
+    private Long vehicleBookRecordId;
+
     /**
      * 预定目标日期(开始)
      */
@@ -92,4 +94,10 @@ public class BookVehicleVO {
      * 预定车辆用途
      */
     private Integer bookType;
+
+    //使用人姓名
+    private String vehicleUsername;
+    //使用人电话
+    private String vehicleUserPhone;
+
 }
\ No newline at end of file

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

@@ -42,4 +42,9 @@ public class VehicleBookRecordQueryVo {
 
     private Integer limit;
 
+    /**
+     * 预定类型
+     */
+    private Integer bookType;
+
 }
\ No newline at end of file

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

@@ -8,5 +8,20 @@ import java.util.List;
 
 @Data
 public class VehicleBookRecordVo extends VehicleBookRecord {
+
     List<VehicleBookHourInfo> vehicleBookHourInfo;
+    //还车分公司
+    private String retCompanyName;
+    //提车分公司
+    private String liftCompanyName;
+    //预定日期二进制字符串
+    private String bookDate;
+    //预定时间二进制字符串
+    private String startHour;
+    //预定时间二进制字符串
+    private String endHour;
+    //停车公司
+    private String parkCompanyName;
+    //所属公司
+    private String subordinateBranchName;
 }

xx-vehicle/xx-vehicle-server/pom.xml

@@ -23,12 +23,6 @@
             <version>2.0-SNAPSHOT</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>com.github.wxiaoqi</groupId>
-            <artifactId>ace-admin-api</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
 
     </dependencies>
 

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

 package com.xxfc.platform.vehicle.biz;
 
+import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.google.common.collect.Lists;
+import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.Area;
+import com.xxfc.platform.vehicle.feign.AdminInfoFeign;
 import com.xxfc.platform.vehicle.mapper.AreaMapper;
-import org.apache.ibatis.annotations.Select;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
+import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
+
 @Service
 public class AreaBiz extends BaseBiz<AreaMapper, Area> {
+
+    @Autowired
+    AdminInfoFeign adminInfoFeign;
+
+    public RestResponse<List<Area>> findAll() {
+        UserDTO userDTO = adminInfoFeign.getAdminUserInfo();
+        if(userDTO == null) {
+            return RestResponse.suc();
+        }
+        String ids = null;
+        if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
+            if(StringUtils.isNotBlank(userDTO.getDataZone())) {
+                ids = userDTO.getDataZone();
+            } else {
+                ids = userDTO.getZoneId() + "";
+            }
+            if(ids.contains(",")) {
+                String[] array = ids.split(",");
+                List<Integer> list = Lists.newArrayList();
+                for(int i = 0; i < array.length; i++) {
+                    if(StringUtils.isNotBlank(array[i])) {
+                        list.add(Integer.parseInt(array[i]));
+                    }
+                }
+                return RestResponse.suc(mapper.findAllByIds(list));
+
+            } else {
+                List<Area> areas = Lists.newArrayList();
+                areas.add(mapper.selectByPrimaryKey(ids));
+                return RestResponse.suc(areas);
+            }
+        } else { //拥有全部权限
+            return RestResponse.suc(mapper.selectAll());
+        }
+
+    }
+
+
 }

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

@@ -13,6 +13,7 @@ import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
 import com.xxfc.platform.vehicle.entity.SysRegion;
+import com.xxfc.platform.vehicle.feign.AdminInfoFeign;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyMapper;
 import com.xxfc.platform.vehicle.util.excel.ExcelImport;
 import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
@@ -21,6 +22,7 @@ import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.collections4.map.HashedMap;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
@@ -39,6 +41,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
@@ -59,6 +62,10 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
     @Autowired
     private SysRegionBiz sysRegionBiz;
 
+    @Autowired
+    AdminInfoFeign adminInfoFeign;
+
+
     @Value("${branchCompanyPic.baseUploadPath}")
     private String baseUploadPath ;
 
@@ -75,7 +82,44 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         if(zoneId == null) {
             return null;
         }
-        return mapper.selectByZoneId(zoneId);
+        UserDTO userDTO = adminInfoFeign.getAdminUserInfo();
+        if(userDTO == null) {
+            return null;
+        }
+        Map<String, Object> map = new HashedMap<>();
+        map.put("zoneId", zoneId);
+        String ids = null;
+        if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
+            if(StringUtils.isNotBlank(userDTO.getDataZone())) { //获取权限大区ID
+                if(userDTO.getDataZone().contains(",")) {
+                    ids = userDTO.getDataZone();
+                } else {
+                    ids = userDTO.getDataZone() + ",";
+                }
+
+            } else {
+                ids = userDTO.getZoneId() + ",";
+            }
+            String companyId = null;
+            if(Arrays.asList(ids.split(",")).contains(zoneId+"")) {//获取权限公司
+                if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
+                    if(userDTO.getDataCompany().contains(",")) {
+                        companyId = userDTO.getDataCompany();
+                    } else  {
+                        companyId = userDTO.getDataCompany() + ",";
+                    }
+                } else {
+                    companyId = userDTO.getCompanyId() + ",";
+                }
+                map.put("ids", companyId.split(","));
+                List<BranchCompany> list = mapper.selectByZoneId(map);   //查询对应大区和公司的数据
+                return list;
+            } else {
+                return null;
+            }
+        }
+        map.put("ids", null);
+        return mapper.selectByZoneId(map);
     }
 
     /**

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

@@ -379,6 +379,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
 
     @Transactional
     public VehicleBookRecord applyVehicle(Integer userId, BookVehicleVO bookVehicleVo, String userName) throws Exception{
+        log.info("预定车辆参数：userId = {}, bookVehicleVo = {},username = {}", userId, bookVehicleVo, userName);
         //检查车辆信息是否合法
         checkIfVehicleExists(bookVehicleVo.getVehicleId());
         //提取日期和相应的预定目标日期
@@ -401,20 +402,31 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         }
 
         //加入预定申请记录
-        VehicleBookRecord vehicleBookRecord = new VehicleBookRecord();
-        vehicleBookRecord.setVehicleId(bookVehicleVo.getVehicleId());
-        vehicleBookRecord.setBookType(bookVehicleVo.getBookType());
-        vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPLY.getCode());
-        vehicleBookRecord.setBookUser(userId);
-        vehicleBookRecord.setBookUserName(userName);
-        vehicleBookRecord.setBookStartDate(new DateTime(new DateTime(startDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
-        vehicleBookRecord.setBookEndDate(new DateTime(new DateTime(endDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
-        vehicleBookRecord.setLiftAddr(bookVehicleVo.getLiftAddr());
-        vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
-        vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
-        vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
-        vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
-        vehicleBookRecordBiz.save(vehicleBookRecord);
+        VehicleBookRecord vehicleBookRecord = null;
+        if(bookVehicleVo.getVehicleBookRecordId() == null) {
+            vehicleBookRecord = new VehicleBookRecord();
+            vehicleBookRecord.setVehicleId(bookVehicleVo.getVehicleId());
+            vehicleBookRecord.setBookType(bookVehicleVo.getBookType());
+            vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+            vehicleBookRecord.setBookUser(userId);
+            vehicleBookRecord.setBookUserName(userName);
+            vehicleBookRecord.setBookStartDate(new DateTime(new DateTime(startDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
+            vehicleBookRecord.setBookEndDate(new DateTime(new DateTime(endDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
+            vehicleBookRecord.setLiftAddr(bookVehicleVo.getLiftAddr());
+            vehicleBookRecord.setRemark(bookVehicleVo.getRemark());
+            vehicleBookRecord.setDestination(bookVehicleVo.getDestination());
+            vehicleBookRecord.setLiftCompany(bookVehicleVo.getLiftCompany());
+            vehicleBookRecord.setRetCompany(bookVehicleVo.getRetCompany());
+            vehicleBookRecord.setVehicleUsername(bookVehicleVo.getVehicleUsername());
+            vehicleBookRecord.setVehicleUserPhone(bookVehicleVo.getVehicleUserPhone());
+            vehicleBookRecordBiz.save(vehicleBookRecord);
+        } else {
+            vehicleBookRecord = vehicleBookRecordBiz.selectById(bookVehicleVo.getVehicleBookRecordId());
+            vehicleBookRecord.setBookStartDate(new DateTime(new DateTime(startDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
+            vehicleBookRecord.setBookEndDate(new DateTime(new DateTime(endDay.toDateTime()).toString(DEFAULT_DATE_TIME_FORMATTER)).toDate());
+            vehicleBookRecordBiz.updateSelectiveByIdRe(vehicleBookRecord);
+        }
+
 //        //添加预定时间记录
             VehicleBookRecord newValue = vehicleBookRecordBiz.selectOne(vehicleBookRecord);
             Map<String, Integer> map = vehicleBookHourInfoBiz.getPredictableHours(bookVehicleVo.getBookStartDate(), bookVehicleVo.getBookEndDate());
@@ -1157,32 +1169,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
     public PageDataVO<VehicleAndModelInfoVo> getAllVehicle(VehiclePlanDto vehiclePlanDto) {
         Query query = new Query(vehiclePlanDto);
         PageDataVO<VehicleAndModelInfoVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllVehicle(query.getSuper()));
-//        for(VehicleAndModelInfoVo vehicleAndModelInfoVo : pageDataVO.getData()) {
-//            //获取时间
-//            if(vehicleAndModelInfoVo.getVehicleBookRecord() != null) {
-//                for(VehicleBookRecord vehicleBookRecord : vehicleAndModelInfoVo.getVehicleBookRecord()) {
-//                    VehicleBookHourInfoDto vehicleBookHourInfoDto = new VehicleBookHourInfoDto();
-//                    vehicleBookHourInfoDto.setVehicleId(vehicleBookRecord.getVehicleId());
-//                    vehicleBookHourInfoDto.setBookRecordId(vehicleBookRecord.getId());
-//                    vehicleBookHourInfoDto.setYearMonthDay(new DateTime(vehicleBookRecord.getBookStartDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-//                    VehicleBookHourInfo startVehicleBookHourInfo = vehicleBookHourInfoBiz.selectByVehicleAndId(vehicleBookHourInfoDto);
-//                    vehicleBookHourInfoDto.setYearMonthDay(new DateTime(vehicleBookRecord.getBookEndDate()).toString(DEFAULT_DATE_TIME_FORMATTER));
-//                    VehicleBookHourInfo endVehicleBookHourInfo = vehicleBookHourInfoBiz.selectByVehicleAndId(vehicleBookHourInfoDto);
-//                    if(startVehicleBookHourInfo != null ) {
-//                        String result = Integer.toBinaryString(startVehicleBookHourInfo.getBookedHour());
-//                        if(StringUtils.isNotBlank(result)) {
-//                                vehicleBookRecord.setStartHour(result);
-//                        }
-//                    }
-//                    if(endVehicleBookHourInfo != null ) {
-//                        String result = Integer.toBinaryString(endVehicleBookHourInfo.getBookedHour());
-//                        if(StringUtils.isNotBlank(result)) {
-//                            vehicleBookRecord.setEndHour(result);
-//                        }
-//                    }
-//                }
-//            }
-//        }
         return pageDataVO;
     }
 

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

@@ -29,22 +29,22 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
     public static final DateTimeFormatter DEFAULT_DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
     public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd");
 
-    public static  Map<String, Integer>  getPredictableHours(String bookStartdate, String bookEndDate) {
+    public static  Map<String, Integer>  getPredictableHours(String bookStartDate, String bookEndDate) {
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         Date startDate = null;
         Date endDate = null;
         try{
-            startDate = simpleDateFormat.parse(bookStartdate);
+            startDate = simpleDateFormat.parse(bookStartDate);
             endDate = simpleDateFormat.parse(bookEndDate);
         }catch (Exception e) {
 
         }
 
         //判定时间是否合法
-        if (bookStartdate.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER)) < 0) {
+        if (bookStartDate.compareTo(DateTime.now().toString(DEFAULT_DATE_TIME_FORMATTER)) < 0) {
             throw new CustomIllegalParamException("you can only book from today");
         }
-        if (bookStartdate.compareTo(bookEndDate) > 0) {
+        if (bookStartDate.compareTo(bookEndDate) > 0) {
             throw new CustomIllegalParamException("预定开始日期不能大于结束日期！");
         }
         Map<String, Integer> predictableHours = Maps.newHashMap();
@@ -53,17 +53,23 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         int endHour = new DateTime(endDate).hourOfDay().get();
         //获取开始天的预定小时
         int startPredictableHour = 0;
-        for (int curentHour = hour; curentHour <= 24; curentHour++) {
-            startPredictableHour |= 1 << (curentHour - 1);
+        if(hour > 0 ) {
+            for (int curentHour = hour; curentHour <= 24; curentHour++) {
+                startPredictableHour |= 1 << (curentHour - 1);
+            }
         }
+
         //获取结束天的预定小时
         int endPredictableHour = 0;
-        for (int curentHour = 0; curentHour < endHour; curentHour++) {
-            endPredictableHour |= 1 << (curentHour);
+        if(endHour > 0) {
+            for (int curentHour = 0; curentHour < endHour; curentHour++) {
+                endPredictableHour |= 1 << (curentHour);
+            }
         }
-        predictableHours.put(DateTime.parse(bookStartdate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
+
+        predictableHours.put(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), startPredictableHour);
         predictableHours.put(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), endPredictableHour);
-        DateTime startDay = DateTime.parse(DateTime.parse(bookStartdate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
+        DateTime startDay = DateTime.parse(DateTime.parse(bookStartDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
         DateTime endDay = DateTime.parse(DateTime.parse(bookEndDate, DEFAULT_DATE_TIME_FORMATTER).toString(DATE_TIME_FORMATTER), DATE_TIME_FORMATTER);
 
         if(endDay.getDayOfMonth() - startDay.getDayOfMonth() >1){ //
@@ -140,7 +146,7 @@ public class VehicleBookHourInfoBiz extends BaseBiz<VehicleBookHourInfoMapper, V
         int i=newString.length()-result.replace("1", "").length();
        System.out.println(i);
 
-        Map<String, Integer> map = getPredictableHours("2019-07-25 05:26:17","2019-07-27 15:26:17");
+        Map<String, Integer> map = getPredictableHours("2019-07-28 00:00:00","2019-07-29 00:00:00");
         for (Map.Entry<String, Integer> entry : map.entrySet()) {
             log.info(entry.getKey());
             log.info(entry.getValue() + "");

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

@@ -83,7 +83,15 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         return queryVehicleBookRecordVo;
     }
 
+    public RestResponse<PageDataVO> getBookRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) {
+        Integer pageNo = vehicleBookRecordQueryVo.getPage() == null ? 1 : vehicleBookRecordQueryVo.getPage();
+        Integer pageSize = vehicleBookRecordQueryVo.getLimit() == null ? 10 : vehicleBookRecordQueryVo.getLimit();
+        List<VehicleBookRecordVo> list = mapper.getBookRecord(vehicleBookRecordQueryVo);
+        PageHelper.startPage(pageNo,pageSize);
+        PageInfo<VehicleBookRecordVo> vehiclePageInfo = new PageInfo<>(list);
+        return RestResponse.suc(PageDataVO.pageInfo(vehiclePageInfo));
 
+    }
 
     public RestResponse<Integer> lift(Integer operatorId, String userName, LiftVehicleVo liftVehicleVo) throws Exception{
         Map<String, Object> params = PropertyUtils.describe(liftVehicleVo);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/AreaMapper.java

@@ -3,5 +3,8 @@ package com.xxfc.platform.vehicle.mapper;
 import com.xxfc.platform.vehicle.entity.Area;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+
 public interface AreaMapper extends Mapper<Area> {
+    List<Area> findAllByIds(List<Integer> ids);
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BranchCompanyMapper.java

@@ -5,8 +5,9 @@ import org.apache.ibatis.annotations.Param;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
+import java.util.Map;
 
 public interface BranchCompanyMapper extends Mapper<BranchCompany> {
     List<BranchCompany> search(@Param("lon") String lon, @Param("lat") String lat, @Param("addrCity") Integer addrCity);
-    List<BranchCompany> selectByZoneId(Integer zoneId);
+    List<BranchCompany> selectByZoneId(Map<String, Object> param);
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleBookRecordMapper.java

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
-import com.xxfc.platform.vehicle.pojo.QueryVehicleBookRecordVo;
-import com.xxfc.platform.vehicle.pojo.VehicleBookRecordAndTbNameVo;
-import com.xxfc.platform.vehicle.pojo.VehicleRecordInfoVo;
-import com.xxfc.platform.vehicle.pojo.dto.VehiclePlanDto;
+import com.xxfc.platform.vehicle.pojo.*;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.List;
@@ -34,4 +31,7 @@ public interface VehicleBookRecordMapper extends Mapper<VehicleBookRecord> {
     public List<VehicleRecordInfoVo> getByParam(Map<String, Object> params);
 
     public List<VehicleBookRecord> getByVehicleId(String vehicleId);
+
+    public List<VehicleBookRecordVo> getBookRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo);
+
 }
\ No newline at end of file

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

@@ -26,7 +26,7 @@ public class AreaController extends BaseController<AreaBiz, Area> {
      */
     @GetMapping("/findAll")
     public RestResponse<List<Area>> findAll(){
-        return RestResponse.suc(baseBiz.selectListAll());
+        return baseBiz.findAll();
 
     }
 

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

@@ -74,6 +74,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
     @Autowired
     private VehicleWarningMsgBiz vehicleWarningMsgBiz;
 
+
     private static Integer MAX_DRIVING_LICENSE_SIZE = 10 * 1024 * 1024;//10M
 
     public static final DateTimeFormatter DEFAULT_FORMATTER = DateTimeFormat.forPattern("yyyy-MM-dd HH:mm:ss");
@@ -205,7 +206,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
      */
     @RequestMapping(value = "/book/4employee", method = RequestMethod.POST)
     @ApiOperation(value = "申请预定车辆信息")
-    public RestResponse<Integer> applyVehicle( BookVehicleVO bookVehicleVo) throws Exception {
+    public RestResponse<Integer> applyVehicle(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
         baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
@@ -436,12 +437,18 @@ public class VehicleController extends BaseController<VehicleBiz> {
         return ObjectRestResponse.succ(map);
     }
 
+    @GetMapping(value = "/app/unauth/getBookRecord")
+    @ApiOperation(value = "获取排班记录")
+    public RestResponse<PageDataVO> getRecord(VehicleBookRecordQueryVo vehicleBookRecordQueryVo) {
+        return vehicleBookRecordBiz.getBookRecord(vehicleBookRecordQueryVo);
+    }
+
+
     @RequestMapping(value = "/app/unauth/getVehicleWarningMsg", method = RequestMethod.GET)
     @ApiOperation(value = "获取排车车辆警告信息")
     @IgnoreClientToken
     @IgnoreUserToken
     public ObjectRestResponse<Map<String, Object>> getVehicleWarningMsg(VehiclePlanDto vehiclePlanDto) {
-
         //获取警告信息
         List<VehicleWarningMsgQueryVo> vehicleWarningMsgs = vehicleWarningMsgBiz.getAllByParam(vehiclePlanDto);
         //获取列表

xx-vehicle/xx-vehicle-server/src/main/resources/logback.xml

-<configuration debug="false" scan="true" scanPeriod="10 seconds">
-	<!--<include resource="org/springframework/boot/logging/logback/base.xml"/>-->
-	<!--<include resource="org/springframework/boot/logging/logback/console-appender.xml"/>-->
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration debug="false">
+	<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径 -->
+	<property name="LOG_HOME" value="${system.log.path:-logs}"/>
 
-	<contextName>logback</contextName>
-
-	<!--输出sql语句-->
-	<logger name="com.xxfc" level="debug"/>
-	<property name="path" value="logs"></property>
-	<property name="maxHistory" value="30"/>
-	<property name="maxFileSize" value="50MB"/>
+	<!-- 彩色日志依赖的渲染类 -->
 	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
 	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
 	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+	<!-- 彩色日志格式 -->
 	<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <!--1. 输出到控制台-->
 		<encoder>
 			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
 			<charset>UTF-8</charset> <!-- 设置字符集 -->
 		</encoder>
 	</appender>
 
-	<appender name="debug_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${path}/logback_debug.log</file>
+	<appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
+		<filter class="com.github.wxiaoqi.security.common.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- 每天一归档 -->
-			<fileNamePattern>${path}/logback_debug.log.%d{yyyy-MM-dd}-%i.zip</fileNamePattern>
-			<maxHistory>${maxHistory}</maxHistory>
-			<timeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>${maxFileSize}</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
+			<FileNamePattern>${LOG_HOME}/sys.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
+			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
-		<encoder>
-			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50} - %msg%n</pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
 		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>DEBUG</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
 	</appender>
 
-	<appender name="info_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${path}/logback_info.log</file>
+	<appender name="WEB_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
+		<filter class="com.github.wxiaoqi.security.common.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- 每天一归档 -->
-			<fileNamePattern>${path}/logback_info.log.%d{yyyy-MM-dd}-%i.zip</fileNamePattern>
-			<maxHistory>${maxHistory}</maxHistory>
-			<timeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>${maxFileSize}</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
+			<FileNamePattern>${LOG_HOME}/log.%d{yyyy-MM-dd}.log</FileNamePattern><!--日志文件输出的文件名 -->
+			<MaxHistory>30</MaxHistory><!--日志文件保留天数 -->
 		</rollingPolicy>
-		<encoder>
-			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+		<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
+			<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50} - %msg%n</pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
 		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>INFO</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
 	</appender>
 
-	<appender name="warn_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${path}/logback_warn.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- 每天一归档 -->
-			<fileNamePattern>${path}/logback_warn.log.%d{yyyy-MM-dd}-%i.zip</fileNamePattern>
-			<maxHistory>${maxHistory}</maxHistory>
-			<timeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>${maxFileSize}</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-		<encoder>
-			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>WARN</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
-	</appender>
+	<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
+		<destination>192.168.0.181:5044</destination>
 
+		<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+			<!--"appname":"springboot21-log-elk" 的作用是指定创建索引的名字时用，并且在生成的文档中会多了这个字段
+                 在logstashindex中引入    index => "%{[appname]}-%{+YYYY.MM.dd}"-->
 
-	<appender name="error_file" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>${path}/logback_error.log</file>
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-			<!-- 每天一归档 -->
-			<fileNamePattern>${path}/logback_error.log.%d{yyyy-MM-dd}-%i.zip</fileNamePattern>
-			<maxHistory>${maxHistory}</maxHistory>
-			<timeBasedFileNamingAndTriggeringPolicy
-					class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-				<maxFileSize>${maxFileSize}</maxFileSize>
-			</timeBasedFileNamingAndTriggeringPolicy>
-		</rollingPolicy>
-		<encoder>
-			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+			<customFields>{"appName":"elk-log-service-gateway-dev"}</customFields>
 		</encoder>
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
-			<level>ERROR</level>
-			<onMatch>ACCEPT</onMatch>
-			<onMismatch>DENY</onMismatch>
-		</filter>
 	</appender>
 
-	<root>
-		<level value="info"/>
-		<appender-ref ref="console"/>
-		<appender-ref ref="debug_file"/>
-		<appender-ref ref="info_file"/>
-		<appender-ref ref="warn_file"/>
-		<appender-ref ref="error_file"/>
+	<root level="INFO">
+		<appender-ref ref="STDOUT" />
+		<appender-ref ref="SYSTEM_FILE" />
+		<appender-ref ref="WEB_FILE" />
 	</root>
-
 </configuration>
\ No newline at end of file

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

@@ -39,8 +39,14 @@
             order by distance asc
         </if>
   </select>
-    <select id="selectByZoneId" parameterType="java.lang.Integer" resultType="com.xxfc.platform.vehicle.entity.BranchCompany">
+    <select id="selectByZoneId" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.BranchCompany">
         select * from branch_company
         where zone_id = #{zoneId}
+        <if test="ids != null">
+            and  id in
+            <foreach collection="ids" item="id" open="(" separator="," close=")">
+              #{id}
+            </foreach>
+        </if>
     </select>
 </mapper>
\ No newline at end of file

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

@@ -338,11 +338,12 @@
         where id = #{id}
 
     </select>
-    <select id="getByVehicleId" parameterType="java.lang.String" resultType="com.xxfc.platform.vehicle.entity.VehicleBookRecord" >
-       SELECT v1.*, conv(v2.booked_hour,10,2) startHour,conv(v3.booked_hour,10,2) endHour from vehicle_book_record v1
+    <select id="getByVehicleId" parameterType="java.lang.String" resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo" >
+       SELECT v1.*, conv(v2.booked_hour,10,2) startHour,conv(v3.booked_hour,10,2) endHour,bc2.name retCompanyName from vehicle_book_record v1
         LEFT JOIN vehicle_book_hour_info v2 on v2.book_record_id = v1.id and YEAR(v2.year_month_day) = YEAR(v1.book_start_date) AND MONTH(v2.year_month_day) = MONTH(v1.book_start_date) AND DAY(v2.year_month_day) =DAY(v1.book_start_date)
         LEFT JOIN vehicle_book_hour_info v3 on v3.book_record_id = v1.id and YEAR(v3.year_month_day) = YEAR(v1.book_end_date) AND MONTH(v3.year_month_day) = MONTH(v1.book_end_date) AND DAY(v3.year_month_day) =DAY(v1.book_end_date)
-        where v1.vehicle_id = #{vehicleId}
+        LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
+        where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2  and v1.book_end_date
     </select>
     <select id="getByParam" parameterType="java.util.Map" resultMap="getVehicleMap">
         select v1.* from vehicle_book_record v1
@@ -367,6 +368,41 @@
         order By v1.create_time DESC
     </select>
 
+    <select id="getBookRecord" resultType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordVo" parameterType="com.xxfc.platform.vehicle.pojo.VehicleBookRecordQueryVo">
+        select bc3.name parkCompanyName,bc4.name subordinateBranchName, conv(v2.booked_date,10,2) book_date, conv(v4.booked_hour,10,2) startHour,conv(v5.booked_hour,10,2) endHour, bc1.`name` lift_company_name, bc2.`name` ret_company_name, v3.number_plate,v1.*
+            from vehicle_book_record v1
+            LEFT JOIN vehicle_book_info v2 on v1.vehicle_id = v2.vehicle and  v2.year_month = CONCAT(YEAR(v1.book_start_date),"-",IF(MONTH(v1.book_start_date) > 10,MONTH(v1.book_start_date),CONCAT("0",MONTH(v1.book_start_date))))
+            LEFT JOIN vehicle_book_hour_info v4 on v4.book_record_id = v1.id and YEAR(v4.year_month_day) = YEAR(v1.book_start_date) AND MONTH(v4.year_month_day) = MONTH(v1.book_start_date) AND DAY(v4.year_month_day) =DAY(v1.book_start_date)
+            LEFT JOIN vehicle_book_hour_info v5 on v5.book_record_id = v1.id and YEAR(v5.year_month_day) = YEAR(v1.book_end_date) AND MONTH(v5.year_month_day) = MONTH(v1.book_end_date) AND DAY(v5.year_month_day) =DAY(v1.book_end_date)
+            LEFT JOIN branch_company bc1 ON v1.lift_company = bc1.id
+            LEFT JOIN branch_company bc2 on v1.ret_company = bc2.id
+            LEFT JOIN vehicle v3 on v3.id = v1.vehicle_id
+            LEFT JOIN branch_company bc3 on v3.park_branch_company_id = bc3.id
+            LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
+        <where>
+            <if test="selectedMonth != null">
+                and v2.year_month = #{selectedMonth}
+            </if>
+            <if test="numberPlate != null">
+                and v3.number_plate = #{numberPlate}
+            </if>
+            <if test="bookType != null">
+                and v1.book_type = #{bookType}
+            </if>
+            <if test="liftCompany != null">
+                and v1.lift_company = = #{liftCompany}
+            </if>
+            <if test="retCompany != null">
+                and v1.ret_company = = #{retCompany}
+            </if>
+            and v1.status BETWEEN 1 and 2
+        </where>
+        order by update_time DESC
+    </select>
+
+
+
+
   <insert id="createTbIfNotExists" parameterType="java.lang.String">
     CREATE TABLE IF NOT EXISTS ${_parameter} (
      `id` bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',

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

@@ -15,6 +15,7 @@
     </resultMap>
 
     <resultMap id="searchModel" type="com.xxfc.platform.vehicle.pojo.VehicleAndModelInfoVo">
+        <result column="id" property="id" jdbcType="VARCHAR" javaType="java.lang.String"/>
         <association property="vehicleModel" column="model_id"
                      select="com.xxfc.platform.vehicle.mapper.VehicleModelMapper.selectByPrimaryKey"/>
         <association property="vehicleBookRecord" column="id"