123

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

@@ -55,4 +55,8 @@ public class VehicleFindDTO extends PageParam implements DataInter {
 
     @ApiModelProperty("店铺类型：1-店铺资产；2-店铺经营；3-店铺停靠")
     private Integer  type;
+
+
+    @ApiModelProperty("店铺状态：1-上架中；2-下架中；3-已调出")
+    private Integer  goodStatus;
 }

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

@@ -1373,6 +1373,25 @@
             <if test="goodsType != null ">
                 AND  v.`goods_type`= #{goodsType}
             </if>
+            <if test="goodStatus != null and goodStatus > 0 and type != null and type > 0 ">
+                <choose>
+                    <when test="goodStatus == 1 and type == 1">
+                        and v.`state`= 1 and  v.`subordinate_branch` == v.`park_branch_company_id` and  v.`subordinate_branch` == v.`manage_company_id
+                    </when>
+                    <when test="goodStatus == 2 and type == 1">
+                        and v.`state`= 2 and  v.`subordinate_branch` == v.`park_branch_company_id` and  v.`subordinate_branch` == v.`manage_company_id
+                    </when>
+                    <when test="goodStatus == 1 and type == 2">
+                        and v.`state`= 1
+                    </when>
+                    <when test="goodStatus == 2 and type == 2 ">
+                        and v.`state`= 2
+                    </when>
+                    <when test="goodStatus == 3">
+                        and  ( v.`subordinate_branch` != v.`park_branch_company_id` or v.`subordinate_branch` != v.`manage_company_id` )
+                    </when>
+                </choose>
+            </if>
             <if test="dataCompanyIds != null and dataCompanyIds.size > 0">
                 <if test="type != null and type > 0">
                     <choose>