修改车辆管理后台

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBiz.java

@@ -51,6 +51,11 @@ public class UserBiz extends BaseBiz<UserMapper,User> {
     @Override
     @CacheClear(pre="user{1.username}")
     public void updateSelectiveById(User entity) {
+        User user1= super.selectById(entity.getId());
+        if(user1!=null&&StringUtils.isNotBlank(entity.getPassword())&&!user1.getPassword().equals(entity.getPassword())){
+            String password = new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(entity.getPassword());
+            entity.setPassword(password);
+        }
         super.updateSelectiveById(entity);
     }
 

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

@@ -184,6 +184,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
             Vehicle vehicle = new Vehicle();
             BeanUtils.copyProperties(vehicle, addOrUpdateVehicleVo);
             vehicle.setId(UUID.randomUUID().toString());
+            vehicle.setParkBranchCompanyId(vehicle.getSubordinateBranch());
 //            检查车牌或者编码是否已存在，已存在则返回失败
             List<Vehicle> exitsVehicles = lockByCode(addOrUpdateVehicleVo);
             if(CollectionUtils.isNotEmpty(exitsVehicles)){

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

@@ -25,17 +25,17 @@ public class VehicleDepartureService {
     @Autowired
     VehicleMapper vehicleMapper;
 
-    public PageInfo<VehicleDepartureLogVo> page(String numberPlate, Integer page, Integer limit) {
+    public PageInfo<VehicleDepartureLogVo> page(String numberPlate,String time, Integer page, Integer limit) {
         PageHelper.startPage(page, limit);
-        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAll(numberPlate));
+        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAll(numberPlate,time));
     }
 
-    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate, Integer page, Integer limit, List<Integer> companyList) {
+    public PageInfo<VehicleDepartureLogVo> pageNotAllData(String numberPlate,String time, 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));
+        return new PageInfo<>(vehicleDepartureLogMapper.selectVoAllNotAllData(numberPlate,time, companyList));
     }
 
     public PageInfo<VehicleDepartureLogVo> findByVehicle(String vehicleId, Integer page, Integer limit) {

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

@@ -13,9 +13,9 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
 
-    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate);
+    List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate,@Param("time") String time);
 
-    List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("companyList") List<Integer> companyList);
+    List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("time") String time,@Param("companyList") List<Integer> companyList);
 
     Integer selectMileageByVehicleId(String vehicleId);
 

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

@@ -34,7 +34,7 @@ public class VehicleDepartureController {
     private UserAuthConfig userAuthConfig;
 
     @GetMapping("page")
-    public RestResponse page(String numberPlate, Integer page, Integer limit, HttpServletRequest request) {
+    public RestResponse page(String numberPlate, String time,Integer page, Integer limit, HttpServletRequest request) {
         if (page == null || limit == null) {
             page = 1;
             limit = 10;
@@ -43,10 +43,10 @@ public class VehicleDepartureController {
         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.data(vehicleDepartureService.pageNotAllData(numberPlate,time, page, limit, companyList));
             }
         }
-        return RestResponse.suc(vehicleDepartureService.page(numberPlate, page, limit));
+        return RestResponse.suc(vehicleDepartureService.page(numberPlate,time,page, limit));
     }
 
     @GetMapping("findByVehicle")

vehicle/src/main/java/com/xinxincaravan/caravan/vehicle/vo/VehiclePageQueryVo.java

@@ -31,6 +31,19 @@ public class VehiclePageQueryVo {
      * 所属分支机构（id）
      */
     private Integer subordinateBranch;
+    /**
+     * 所属分支机构（id）
+     */
+    private Integer addrProvince;
+    /**
+     * 所属分支机构（id）
+     */
+    private Integer addrCity;
+
+    /**
+     * 片区
+     */
+    private Integer zoneId;
 
     /**
      * 用途类型：租赁房车（1）、展车等，对应关系见车辆常量表

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

@@ -22,8 +22,22 @@
         from vehicle_departure_log
         left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
         <trim prefix="where">
+            1=1
             <if test="numberPlate != null and numberPlate != ''">
-                vehicle.number_plate = #{numberPlate}
+                and vehicle.number_plate = #{numberPlate}
+            </if>
+              <if test="time != null and time != ''">
+                 and  (vehicle_departure_log.arrival_time >=  str_to_date(#{time}, '%Y-%m-%d %H')
+                  or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
+                  or vehicle_departure_log.arrival_time is null
+                  )
+                  and
+                  (
+                  vehicle_departure_log.departure_time &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
+                  or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
+                  or vehicle_departure_log.departure_time is null
+                  )
+
               </if>
         </trim>
         order by create_time desc
@@ -54,6 +68,18 @@
                 )
                 )
             </if>
+            <if test="time != null and time != ''">
+                and  (vehicle_departure_log.arrival_time >=  str_to_date(#{time}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
+                or vehicle_departure_log.arrival_time is null
+                )
+                and
+                (
+                vehicle_departure_log.departure_time  &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
+                or vehicle_departure_log.departure_time is null
+                )
+            </if>
         </trim>
         order by create_time desc
     </select>

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

@@ -12,13 +12,13 @@
 
     <select id="getByPage" parameterType="java.util.Map"
             resultType="com.xinxincaravan.caravan.vehicle.vo.QueryVehicleVo">
-        select v.`id`,
+        select  DISTINCT v.`id`,
         v.`code`,
         v.`status`,
         v.number_plate,
         v.brand,
         v.subordinate_branch,
-        bc.name as subBranchName,
+        IFNULL(bc.name,bc1.name) AS subBranchName,
         v.use_type,
         v.remark,
         v.create_time,
@@ -46,7 +46,8 @@
             left join
             vehicle_book_info vbi on v.`id` = vbi.vehicle
         </if>
-        left join branch_company bc on v.`subordinate_branch` = bc.id
+        LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
+        LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         where
         1=1
         <if test="mRangeDateEnd !=null">
@@ -73,9 +74,6 @@
         <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>
@@ -100,18 +98,36 @@
                 )
             </foreach>
         </if>
+         <if test="subordinateBranch !=null or addrProvince !=null or  addrCity !=null or zoneId !=null ">
+        and (
+         <trim suffixOverrides="OR">
+        <if test="subordinateBranch !=null ">
+             ( v.park_branch_company_id = #{subordinateBranch} or v.expect_destination_branch_company_id=#{subordinateBranch} ) OR
+        </if>
+        <if test="addrProvince !=null">
+             (bc.addr_province=#{addrProvince} or bc1.addr_province=#{addrProvince}) OR
+        </if>
+        <if test="addrCity !=null">
+              (bc.addr_city=#{addrProvince} or bc1.addr_city=#{addrProvince}) OR
+        </if>
+        <if test="zoneId !=null">
+              (bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId})  OR
+        </if>
+         </trim>
+        )
+         </if>
         order by v.code
     </select>
 
     <select id="getByPageNotAllData" parameterType="java.util.Map"
             resultType="com.xinxincaravan.caravan.vehicle.vo.QueryVehicleVo">
-        select v.`id`,
+        select DISTINCT  v.`id`,
         v.`code`,
         v.`status`,
         v.number_plate,
         v.brand,
         v.subordinate_branch,
-        bc.name as subBranchName,
+        IFNULL(bc.name,bc1.name) AS subBranchName,
         v.use_type,
         v.remark,
         v.create_time,
@@ -138,23 +154,24 @@
             left join
             vehicle_book_info vbi on v.`id` = vbi.vehicle
         </if>
-        left join branch_company bc on v.`subordinate_branch` = bc.id
+        LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id
+        LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         where
         1=1
         <if test="companyList != null">
             and ( v.park_branch_company_id in (
-            <foreach collection="companyList" item="companyId">
             <trim  suffixOverrides=",">
+            <foreach collection="companyList" item="companyId">
                       #{companyId},
-                </trim>
             </foreach>
+            </trim>
             )
             or v.expect_destination_branch_company_id in (
-            <foreach collection="companyList" item="companyId">
             <trim   suffixOverrides=",">
+            <foreach collection="companyList" item="companyId">
                     #{companyId},
-                </trim>
             </foreach>
+            </trim>
             )
             )
         </if>
@@ -182,9 +199,6 @@
         <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>
@@ -209,6 +223,24 @@
                 )
             </foreach>
         </if>
+        <if test="subordinateBranch !=null or addrProvince !=null or  addrCity !=null or zoneId !=null ">
+            and (
+            <trim suffixOverrides="OR">
+                <if test="subordinateBranch !=null ">
+                    ( v.park_branch_company_id = #{subordinateBranch} or v.expect_destination_branch_company_id=#{subordinateBranch} ) OR
+                </if>
+                <if test="addrProvince !=null">
+                    (bc.addr_province=#{addrProvince} or bc1.addr_province=#{addrProvince}) OR
+                </if>
+                <if test="addrCity !=null">
+                    (bc.addr_city=#{addrProvince} or bc1.addr_city=#{addrProvince}) OR
+                </if>
+                <if test="zoneId !=null">
+                    (bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId})  OR
+                </if>
+            </trim>
+            )
+        </if>
         order by v.code
     </select>