修改后台车型和标签列表

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

@@ -40,6 +40,24 @@ public class QueryVehicleVo {
      */
     private String subBranchName;
 
+    /**
+     * 停靠分支机构（id）
+     */
+    private Integer parkBranchCompanyId;
+    /**
+     * 停靠分支机构（名称）
+     */
+    private String parkBranchCompanyName;
+
+    /**
+     * 目的地分支机构（id）
+     */
+    private Integer expectDestinationBranchCompanyId;
+    /**
+     * 目的地分支机构（名称）
+     */
+    private String expectDestinationBranchCompanyName;
+
     /**
      * 用途类型：租赁房车（1）、展车等，对应关系见车辆常量表
      */

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

+package com.xxfc.platform.vehicle.pojo;
+
+import lombok.Data;
+
+import java.util.Date;
+
+@Data
+public class ResultVehicleVo {
+    /**
+     * 主键(uuid)
+     */
+    private String id;
+
+    /**
+     * 车辆编号，0-没有
+     */
+    private Integer code;
+
+    /**
+     * 车辆状态： 1-正常运行 2-维修 3-报废
+     */
+    private Integer status;
+
+    /**
+     * 车牌号，空字符串-没有
+     */
+    private String numberPlate;
+
+    /**
+     * 品牌（编码，对应关系见相关常量），0-未填写
+     */
+    private Integer brand;
+
+    /**
+     * 所属分支机构（id）
+     */
+    private Integer subordinateBranch;
+    /**
+     * 所属分支机构（名称）
+     */
+    private String subBranchName;
+
+    /**
+     * 停靠分支机构（id）
+     */
+    private Integer parkBranchCompanyId;
+    /**
+     * 停靠分支机构（名称）
+     */
+    private String parkBranchCompanyName;
+
+    /**
+     * 目的地分支机构（id）
+     */
+    private Integer expectDestinationBranchCompanyId;
+    /**
+     * 目的地分支机构（名称）
+     */
+    private String expectDestinationBranchCompanyName;
+
+
+    /**
+     * 用途类型：租赁房车（1）、展车等，对应关系见车辆常量表
+     */
+    private Integer useType;
+
+    /**
+     * 备注信息
+     */
+    private String remark;
+
+    private Date createTime;
+
+    private Date updateTime;
+
+    /**
+     * 车架号
+     */
+    private String vin;
+
+    /**
+     * 保险公司，见常量表
+     */
+    private Integer insuranceCompany;
+
+
+    /**
+     * 保险单号
+     */
+    private String insuranceNo;
+
+    /**
+     * 保险开始时间
+     */
+    private Date insuranceStartDate;
+
+    /**
+     * 保险结束时间
+     */
+    private Date insuranceEndDate;
+
+    /**
+     * 年审时间
+     */
+    private Date annualVerificationDate;
+
+    /**
+     * 保养时间
+     */
+    private Date maintenanceDate;
+    /**
+     * 保养公里
+     */
+    private Integer mileage;
+
+    /**
+     * 保养里程数
+     */
+    private Integer maintenanceMileage;
+
+    /**
+     * 车辆所属人-类型
+     */
+    private Integer belongTo;
+
+    /**
+     * 所属人 名称
+     */
+    private String belongToName;
+
+    /**
+     * 行驶证路径
+     */
+    private String drivingLicensePath;
+
+
+    /**
+     * 发动机号
+     */
+    private String engineNum;
+
+    /**
+     * 生产商
+     */
+    private String manufacturer;
+
+    /**
+     * 收车时间
+     */
+    private Date receiveTime;
+}
\ No newline at end of file

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

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

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

@@ -30,15 +30,21 @@
 
 
     <select id="getByPage" parameterType="java.util.Map"
-            resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleVo">
+            resultType="com.xxfc.platform.vehicle.pojo.ResultVehicleVo">
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
         v.`status`,
         v.number_plate,
         v.brand,
-        IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
-        IFNULL(bc.name,bc1.name) AS subBranchName,
+        -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
+        -- IFNULL(bc.name,bc1.name) AS subBranchName,
+        v.park_branch_company_id,
+        bc.name as parkBranchCompanyName,
+        v.expect_destination_branch_company_id,
+        bc1.name as expectDestinationBranchCompanyName,
+        v.subordinate_branch,
+        bc2.name as subBranchName,
         v.use_type,
         v.remark,
         v.create_time,
@@ -66,8 +72,14 @@
             left join
             vehicle_book_info vbi on v.`id` = vbi.vehicle
         </if>
+        -- 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
+        -- 停车分公司
         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
+        -- 所属分公司
+        LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
         where
         v.is_del=0
         <if test="mRangeDateEnd !=null">
@@ -127,11 +139,12 @@
             </foreach>
         </if>
         <if test="subordinateBranch !=null ">
-            and ( v.park_branch_company_id = #{subordinateBranch} or v.expect_destination_branch_company_id=#{subordinateBranch} )
+            and ( v.park_branch_company_id = #{subordinateBranch} or
+            v.expect_destination_branch_company_id=#{subordinateBranch} )
         </if>
         <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
-        	and (
-        	<trim suffixOverrides="OR">
+            and (
+            <trim suffixOverrides="OR">
                 <if test="addrProvince !=null">
                     (bc.addr_province=#{addrProvince} or bc1.addr_province=#{addrProvince}) OR
                 </if>
@@ -141,23 +154,29 @@
                 <if test="zoneId !=null">
                     (bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId}) OR
                 </if>
-        	</trim>
-        	)
+            </trim>
+            )
         </if>
         order by v.code
         ) r ORDER BY r.subBranchName
     </select>
 
     <select id="getByPageNotAllData" parameterType="java.util.Map"
-            resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleVo">
+            resultType="com.xxfc.platform.vehicle.pojo.ResultVehicleVo">
         SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
         v.`status`,
         v.number_plate,
         v.brand,
-        IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
-        IFNULL(bc.name,bc1.name) AS subBranchName,
+        -- IFNULL(v.park_branch_company_id,v.expect_destination_branch_company_id) AS subordinate_branch,
+        -- IFNULL(bc.name,bc1.name) AS subBranchName,
+        v.park_branch_company_id,
+        bc.name as parkBranchCompanyName,
+        v.expect_destination_branch_company_id,
+        bc1.name as expectDestinationBranchCompanyName,
+        v.subordinate_branch,
+        bc2.name as subBranchName,
         v.use_type,
         v.remark,
         v.create_time,
@@ -185,24 +204,36 @@
             left join
             vehicle_book_info vbi on v.`id` = vbi.vehicle
         </if>
+        -- 停车分公司
         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
+        -- 所属分公司
+        LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
         where
         v.is_del=0
         <if test="companyList != null">
             and ( v.park_branch_company_id in (
-                <trim suffixOverrides=",">
-                    <foreach collection="companyList" item="companyId">
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
                     #{companyId},
-                    </foreach>
-                </trim>
+                </foreach>
+            </trim>
             )
             or v.expect_destination_branch_company_id in (
-                <trim suffixOverrides=",">
-                    <foreach collection="companyList" item="companyId">
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
+                    #{companyId},
+                </foreach>
+            </trim>
+            )
+            or v.subordinate_branch in (
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
                     #{companyId},
-                    </foreach>
-                </trim>
+                </foreach>
+            </trim>
+            )
             )
             )
         </if>
@@ -262,7 +293,8 @@
             </foreach>
         </if>
         <if test="subordinateBranch !=null ">
-            and ( v.park_branch_company_id = #{subordinateBranch} or v.expect_destination_branch_company_id=#{subordinateBranch} )
+            and ( v.park_branch_company_id = #{subordinateBranch} or
+            v.expect_destination_branch_company_id=#{subordinateBranch} )
         </if>
         <if test=" addrProvince !=null or  addrCity !=null or zoneId !=null ">
             and (
@@ -274,7 +306,7 @@
                     (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
+                    (bc.zone_id=#{zoneId} or bc1.zone_id=#{zoneId}) OR
                 </if>
             </trim>
             )

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

@@ -10,9 +10,11 @@
         parent_id,name,icon,depict,rank,level,state,crt_time,upd_time,isMore,start_using
         ) VALUES
         <foreach collection ="vpclist" item="vpc" index="index" separator =",">
+        <if test="vpc.state == 0" >
             (#{vpc.parentId},#{vpc.name},#{vpc.icon},#{vpc.depict}
             ,#{vpc.rank},#{vpc.level},#{vpc.state},#{vpc.crtTime}
             ,#{vpc.updTime},#{vpc.isMore},#{vpc.startUsing})
+        </if>
         </foreach>
     </insert>