解决合并修改

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

@@ -146,4 +146,9 @@ public class  Vehicle {
      */
     @Column(name = "travel_status")
     private Integer travelStatus;
+
+    /**
+     * 是否删除；0-正常；1-删除
+     */
+    private Integer isDel;
 }
\ No newline at end of file

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

@@ -1064,4 +1064,12 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> {
         return pageDataVO;
     }
 
+    //删除车辆信息
+    public  RestResponse delVehicleById(String id){
+        Vehicle vehicle=new Vehicle();
+        vehicle.setId(id);
+        vehicle.setIsDel(1);
+        updateSelectiveById(vehicle);
+        return  RestResponse.suc();
+    }
 }

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

@@ -465,6 +465,16 @@ public class VehicleController extends BaseController<VehicleBiz> {
      return   baseBiz.getOneById(id);
    }
 
+    /**
+     * 删除车辆信息
+     * @param id
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/del/{id}", method = RequestMethod.DELETE)
+    public RestResponse retVehicle(@PathVariable String id) throws Exception {
 
+        return baseBiz.delVehicleById(id);
+    }
 
 }

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

@@ -31,6 +31,7 @@
 
     <select id="getByPage" parameterType="java.util.Map"
             resultType="com.xxfc.platform.vehicle.pojo.QueryVehicleVo">
+        SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
         v.`status`,
@@ -68,7 +69,7 @@
         LEFT JOIN branch_company bc ON v.park_branch_company_id = bc.id	58	left join branch_company bc on v.`subordinate_branch` = bc.id
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         where
-        1=1
+        v.is_del=0
         <if test="mRangeDateEnd !=null">
             and v.maintenance_date &lt;= #{mRangeDateEnd}
         </if>
@@ -125,12 +126,12 @@
                 )
             </foreach>
         </if>
-        <if test="subordinateBranch !=null or addrProvince !=null or addrCity !=null or zoneId !=null ">
+        <if test="subordinateBranch !=null ">
+            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">
-                <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>
@@ -144,10 +145,12 @@
         	)
         </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">
+        SELECT r.* FROM (
         select DISTINCT v.`id`,
         v.`code`,
         v.`status`,
@@ -185,7 +188,7 @@
         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
+        v.is_del=0
         <if test="companyList != null">
             and ( v.park_branch_company_id in (
                 <trim suffixOverrides=",">
@@ -258,12 +261,12 @@
                 )
             </foreach>
         </if>
-        <if test="subordinateBranch !=null or addrProvince !=null or  addrCity !=null or zoneId !=null ">
+        <if test="subordinateBranch !=null ">
+            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">
-                <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>
@@ -277,6 +280,7 @@
             )
         </if>
         order by v.code
+        ) r ORDER BY r.subBranchName
     </select>
 
     <select id="lockByCode" resultType="com.xxfc.platform.vehicle.entity.Vehicle"