车辆管理相关修改

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleActiveService.java

@@ -56,8 +56,9 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_DISABLE.getCode());
         }
 
-        // 写入车辆公里数
+        // 写入车辆公里数,预计目的地
         vehicle.setMileageLastUpdate(departureVo.getMileage());
+        vehicle.setExpectDestinationBranchCompanyId(departureVo.getExpectArrivalBranchCompanyId());
         vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
         // 修改车辆状态，确认是空闲状态
@@ -100,8 +101,10 @@ public class VehicleActiveService {
                     ResCode.VEHICLE_DEPARTURE_VEHICLE_UNDEPARTURE.getCode());
         }
 
-        // 写入车辆公里数
+        // 写入车辆公里数,还车分公司id
         vehicle.setMileageLastUpdate(arrivalVo.getMileage());
+        vehicle.setParkBranchCompanyId(arrivalVo.getArrivalBranchCompanyId());
+        vehicle.setExpectDestinationBranchCompanyId(0);
         vehicleMapper.updateByPrimaryKeySelective(vehicle);
 
         // 修改状态，确认是出车状态

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleBiz.java

@@ -83,7 +83,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
     /**
      * 写入上传文件，返回相对路径
      * @param file
-     * @param vehicleId
      * @return
      */
     public RestResponse<String> uploadDrivingLicense(MultipartFile file) throws Exception{
@@ -793,6 +792,32 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         PageInfo<QueryVehicleVo> vehiclePageInfo = new PageInfo<>(vehicles);
         return PageDataVo.pageInfo(vehiclePageInfo);
     }
+    /**
+     * 按页查询(非所有数据，过滤分公司信息)
+     * @param vehiclePageQueryVo
+     * @return
+     * @throws Exception
+     */
+    public PageDataVo<QueryVehicleVo> getByPageNotAllData(VehiclePageQueryVo vehiclePageQueryVo, List<Integer> companyList) throws Exception{
+        Map<String, Object> params = PropertyUtils.describe(vehiclePageQueryVo);
+        Integer pageSize = (Integer) params.get("limit");
+        params.remove("pageSize");
+        Integer pageNo = (Integer) params.get("page");
+        params.remove("pageNo");
+        //处理预定日期相关参数
+        adjustBookedInfoParam(params,vehiclePageQueryVo);
+        if (companyList != null && companyList.size() > 0) {
+            params.put("companyList", companyList);
+        } else {
+            params.put("companyList", Arrays.asList(-1));
+        }
+        PageHelper.startPage(pageNo,pageSize);
+        List<QueryVehicleVo> vehicles = mapper.getByPageNotAllData(params);
+        PageInfo<QueryVehicleVo> vehiclePageInfo = new PageInfo<>(vehicles);
+        return PageDataVo.pageInfo(vehiclePageInfo);
+    }
+
+
 
     public List<Integer> dataCompany(String dataZone, String dataCompany) {
         List<BranchCompany> zoneCompanys = branchCompanyBiz.dataCompany(dataZone);

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/biz/VehicleDepartureService.java

@@ -13,6 +13,9 @@ import com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureStatisticDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Arrays;
+import java.util.List;
+
 @Service
 public class VehicleDepartureService {
 
@@ -27,6 +30,14 @@ public class VehicleDepartureService {
         return new PageInfo<>(vehicleDepartureLogMapper.selectVoAll(numberPlate));
     }
 
+    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate, Integer page, Integer limit, List<Integer> companyList) {
+        PageHelper.startPage(page, limit);
+        if (companyList == null || companyList.size() == 0) {
+            companyList = Arrays.asList(-1);
+        }
+        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAllNotAllData(numberPlate, companyList));
+    }
+
     public PageInfo<VehicleDepartureLogVo> findByVehicle(String vehicleId, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
         return new PageInfo<>(vehicleDepartureLogMapper.selectByVehicleId(vehicleId));

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/config/WebConfiguration.java

@@ -64,7 +64,8 @@ public class WebConfiguration implements WebMvcConfigurer {
         ArrayList<String> list = new ArrayList<>();
         String[] urls = {
                 "/vehicleInfo/**",
-                "/branchCompany/**"
+                "/branchCompany/**",
+                "/departure/**"
         };
         Collections.addAll(list, urls);
         return list;

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/entity/Vehicle.java

@@ -127,5 +127,13 @@ public class Vehicle {
      * 最后更新里程数
      */
     private Integer mileageLastUpdate;
+    /**
+     * 停车分公司id
+     */
+    private Integer parkBranchCompanyId;
+    /**
+     * 预计目的地分公司id
+     */
+    private Integer expectDestinationBranchCompanyId;
 
 }
\ No newline at end of file

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/mapper/VehicleDepartureLogMapper.java

@@ -15,6 +15,8 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate);
 
+    List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("companyList") List<Integer> companyList);
+
     Integer selectMileageByVehicleId(String vehicleId);
 
     Integer selectDayByVehicleId(String vehicleId);

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/mapper/VehicleMapper.java

@@ -12,6 +12,7 @@ import java.util.Map;
 public interface VehicleMapper extends Mapper<Vehicle> {
 
     public List<QueryVehicleVo> getByPage(Map<String,Object> params);
+    public List<QueryVehicleVo> getByPageNotAllData(Map<String,Object> params);
 
     public int updateStatusById(Map<String,Object> params);
 

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/rest/VehicleDepartureController.java

 package com.xinxincaravan.caravan.vehicle.rest;
 
 import com.github.wxiaoqi.security.auth.client.annotation.IgnoreClientToken;
+import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
+import com.xinxincaravan.caravan.vehicle.biz.VehicleBiz;
 import com.xinxincaravan.caravan.vehicle.biz.VehicleDepartureService;
 import com.xinxincaravan.caravan.vehicle.common.RestResponse;
 import com.xinxincaravan.caravan.vehicle.constant.ResCode.ResCode;
+import com.xinxincaravan.caravan.vehicle.feign.UserFeign;
+import com.xinxincaravan.caravan.vehicle.feign.dto.UserDTO;
 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;
 
+import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
+
 @IgnoreClientToken
 @RestController
 @RequestMapping("departure")
@@ -16,13 +24,28 @@ public class VehicleDepartureController {
 
     @Autowired
     VehicleDepartureService vehicleDepartureService;
+    @Autowired
+    VehicleBiz vehicleBiz;
+
+    @Autowired
+    UserFeign userFeign;
+
+    @Autowired
+    private UserAuthConfig userAuthConfig;
 
     @GetMapping("page")
-    public RestResponse page(String numberPlate, Integer page, Integer limit) {
+    public RestResponse page(String numberPlate, Integer page, Integer limit, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
         }
+        UserDTO userDTO = userFeign.userinfoByToken(userAuthConfig.getToken(request)).getData();
+        if (userDTO != null) {
+            if (userDTO.getDataAll() == 2) {
+                List<Integer> companyList = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+                return RestResponse.data(vehicleDepartureService.pageNotAllData(numberPlate, page, limit, companyList));
+            }
+        }
         return RestResponse.suc(vehicleDepartureService.page(numberPlate, page, limit));
     }
 

vehicle/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -27,6 +27,34 @@
         </trim>
         order by create_time desc
     </select>
+    <select id="selectVoAllNotAllData" resultType="com.xinxincaravan.caravan.vehicle.vo.VehicleDepartureLogVo">
+        select vehicle_departure_log.*,vehicle.number_plate
+        from vehicle_departure_log
+        left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
+        <trim prefix="where" suffixOverrides="and">
+            <if test="numberPlate != null and numberPlate != ''">
+                vehicle.number_plate = #{numberPlate} and
+            </if>
+            <if test="companyList != null">
+                ( vehicle.park_branch_company_id in (
+                <foreach collection="companyList" item="companyId">
+                    <trim suffixOverrides=",">
+                        #{companyId},
+                    </trim>
+                </foreach>
+                )
+                or vehicle.expect_destination_branch_company_id in (
+                <foreach collection="companyList" item="companyId">
+                    <trim suffixOverrides=",">
+                        #{companyId},
+                    </trim>
+                </foreach>
+                )
+                )
+            </if>
+        </trim>
+        order by create_time desc
+    </select>
     <select id="selectMileageByVehicleId" resultType="int">
         select sum(mileage_end - mileage_start)
         from vehicle_departure_log

vehicle/src/main/resources/mapper/VehicleMapper.xml

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.xinxincaravan.caravan.vehicle.mapper.VehicleMapper" >
+<mapper namespace="com.xinxincaravan.caravan.vehicle.mapper.VehicleMapper">
 
-    <update id="updateStatusById" parameterType="java.util.Map" >
+    <update id="updateStatusById" parameterType="java.util.Map">
         update vehicle set status = #{status} where id in
         <foreach collection="idList" index="i" item="item" separator="," open="(" close=")">
             #{item}
@@ -10,7 +10,8 @@
     </update>
 
 
-  <select id="getByPage" parameterType="java.util.Map" resultType="com.xinxincaravan.caravan.vehicle.vo.QueryVehicleVo">
+    <select id="getByPage" parameterType="java.util.Map"
+            resultType="com.xinxincaravan.caravan.vehicle.vo.QueryVehicleVo">
         select v.`id`,
         v.`code`,
         v.`status`,
@@ -91,7 +92,7 @@
         </if>
         <!-- 若需根据预定日期条件查询，针对换为位操作  -->
         <if test=" yearMonthAndParam !=null  ">
-          <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation" >
+            <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation">
                 and
                 ( (vbi.`year_month` = #{yearMonth} or vbi.`year_month` is null) and
                 ifnull(vbi.`booked_date`,0) &amp; #{andOperation.andOperationFactor} = #{andOperation.andOperationRs}
@@ -101,7 +102,117 @@
         order by v.code
     </select>
 
-    <select id="lockByCode" resultType="com.xinxincaravan.caravan.vehicle.entity.Vehicle" parameterType="com.xinxincaravan.caravan.vehicle.vo.AddOrUpdateVehicleVo">
+    <select id="getByPageNotAllData" parameterType="java.util.Map"
+            resultType="com.xinxincaravan.caravan.vehicle.vo.QueryVehicleVo">
+        select v.`id`,
+        v.`code`,
+        v.`status`,
+        v.number_plate,
+        v.brand,
+        v.subordinate_branch,
+        bc.name as subBranchName,
+        v.use_type,
+        v.remark,
+        v.create_time,
+        v.vin,
+        v.insurance_company,
+        v.insurance_no,
+        v.insurance_start_date,
+        v.insurance_end_date,
+        v.annual_verification_date,
+        v.maintenance_date,
+        v.maintenance_mileage,
+        v.belong_to,
+        v.belong_to_name,
+        v.driving_license_path,
+        v.engine_num,
+        v.manufacturer,
+        v.receive_time,
+        v.update_time
+        <if test=" yearMonthAndParam !=null ">
+            ,vbi.booked_date
+        </if>
+        from vehicle v
+        <if test=" yearMonthAndParam !=null  ">
+            left join
+            vehicle_book_info vbi on v.`id` = vbi.vehicle
+        </if>
+        left join branch_company bc on v.`subordinate_branch` = bc.id
+        where
+        1=1
+        <if test="companyList != null">
+            and ( v.park_branch_company_id in (
+            <foreach collection="companyList" item="companyId">
+                <trim suffixOverrides=",">
+                    #{companyId},
+                </trim>
+            </foreach>
+            )
+            or v.expect_destination_branch_company_id in (
+            <foreach collection="companyList" item="companyId">
+                <trim suffixOverrides=",">
+                    #{companyId},
+                </trim>
+            </foreach>
+            )
+            )
+        </if>
+        <if test="mRangeDateEnd !=null">
+            and v.maintenance_date &lt;= #{mRangeDateEnd}
+        </if>
+        <if test="mRangeDateStart !=null">
+            and v.maintenance_date &gt;= #{mRangeDateStart}
+        </if>
+        <if test="aVRangeDateStart !=null">
+            and v.annual_verification_date &lt;= #{aVRangeDateEnd}
+        </if>
+        <if test="aVRangeDateEnd !=null">
+            and v.annual_verification_date &gt;= #{aVRangeDateStart}
+        </if>
+        <if test="insuranceDateRangeStart !=null">
+            and v.insurance_end_date &lt;= #{insuranceDateRangeEnd}
+        </if>
+        <if test="insuranceDateRangeEnd !=null">
+            and v.insurance_end_date &gt;= #{insuranceDateRangeStart}
+        </if>
+        <if test="insuranceCompany !=null">
+            and v.insurance_company = #{insuranceCompany}
+        </if>
+        <if test="vin !=null and vin != ''">
+            and v.vin = #{vin}
+        </if>
+        <if test="subordinateBranch !=null">
+            and v.subordinate_branch = #{subordinateBranch}
+        </if>
+        <if test="code !=null">
+            and v.code = #{code}
+        </if>
+        <if test="status !=null">
+            and v.status = #{status}
+        </if>
+        <if test="numberPlate !=null and numberPlate != ''">
+            and v.number_plate = #{numberPlate}
+        </if>
+        <if test="brand !=null">
+            and v.brand = #{brand}
+        </if>
+        <if test="useType !=null">
+            and v.use_type = #{useType}
+        </if>
+        <!-- 若需根据预定日期条件查询，针对换为位操作  -->
+        <if test=" yearMonthAndParam !=null  ">
+            <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation">
+                and
+                ( (vbi.`year_month` = #{yearMonth} or vbi.`year_month` is null) and
+                ifnull(vbi.`booked_date`,0) &amp; #{andOperation.andOperationFactor} = #{andOperation.andOperationRs}
+                )
+            </foreach>
+        </if>
+        order by v.code
+    </select>
+
+    <select id="lockByCode" resultType="com.xinxincaravan.caravan.vehicle.entity.Vehicle"
+            parameterType="com.xinxincaravan.caravan.vehicle.vo.AddOrUpdateVehicleVo">
         select
             v.`id`,
             v.`code`,

xx-member/src/main/resources/builder/mybatis-generator.xml

@@ -47,13 +47,13 @@
             <property name="enableSubPackages" value="true"/>
         </javaClientGenerator>
 
-        <table tableName="member_info" domainObjectName="MemberInfo" enableCountByExample="false"
-               enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false"
-               selectByExampleQueryId="false"/>
+<!--        <table tableName="member_info" domainObjectName="MemberInfo" enableCountByExample="false"-->
+<!--               enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false"-->
+<!--               selectByExampleQueryId="false"/>-->
 
-        <table tableName="member_family_info" domainObjectName="MemberFamilyInfo" enableCountByExample="false"
-               enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false"
-               selectByExampleQueryId="false"/>
+<!--        <table tableName="member_family_info" domainObjectName="MemberFamilyInfo" enableCountByExample="false"-->
+<!--               enableUpdateByExample="false" enableDeleteByExample="false" enableSelectByExample="false"-->
+<!--               selectByExampleQueryId="false"/>-->
 
     </context>
 </generatorConfiguration>
\ No newline at end of file