修改车型

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

@@ -115,5 +115,17 @@ public class VehicleModel implements Serializable {
 
 	@Column(name = "hot_sign")
 	@ApiModelProperty(value = "热度标记，1--热门；2--非热门")
-	Integer hotSign;
+	private Integer hotSign;
+
+    @ApiModelProperty(value = "总数量")
+     private Integer sum;
+
+
+    @ApiModelProperty(value = "可租借数量")
+    private Integer leasableQuantity;
+
+
+    @ApiModelProperty(value = "车辆")
+    private  Vehicle vehicle;
+
 }

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

-package com.xxfc.platform.vehicle.entity;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import javax.persistence.Column;
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-
-/**
- * 接收车型查询条件
- */
-@Data
-public class VehicleModelQueryCondition implements Serializable {
-    private static final long serialVersionUID = 1L;
-    //主键
-    @ApiModelProperty("主键")
-    private Integer id;
-
-
-    @ApiModelProperty(value = "名称")
-    private String name;
-
-
-    @ApiModelProperty(value = "配置")
-    private List<String> config;
-
-
-    @ApiModelProperty(value = "关键字id")
-    private List<String> keyword;
-
-
-    @ApiModelProperty(value = "房车展示")
-    private String modelShow;
-
-
-    @ApiModelProperty(value = "参数")
-    private List<String> modelParam;
-
-    //价格
-    @ApiModelProperty(value = "价格")
-    private BigDecimal price;
-
-    //价格
-    @ApiModelProperty(value = "押金")
-    private BigDecimal deposit;
-
-    //创建时间
-    @ApiModelProperty(value = "创建时间", hidden = true )
-    private Date crtTime;
-
-    //创建者id
-    @ApiModelProperty(value = "创建者id")
-    private Integer crtUser;
-
-    //创建者名称
-    @ApiModelProperty(value = "创建者名称")
-    private String crtName;
-
-    //创建者host
-    @Column(name = "crt_host")
-    @ApiModelProperty(value = "创建者host")
-    private String crtHost;
-
-    //修改时间
-    @ApiModelProperty(value = "修改时间", hidden = true )
-    private Date updTime;
-
-    //修改者
-    @ApiModelProperty(value = "修改者")
-    private Integer updUser;
-
-    //修改者名称
-    @ApiModelProperty(value = "修改者名称")
-    private String updName;
-
-    //修改者host
-    @ApiModelProperty(value = "修改者host")
-    private String updHost;
-
-    //评分
-    @ApiModelProperty(value = "评分")
-    private Integer score;
-
-
-    @ApiModelProperty(value = "车辆总数")
-    private Integer  sum;
-
-
-    @ApiModelProperty(value = "可租借数量")
-    private Integer leasableQuantity;
-}

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

 package com.xxfc.platform.vehicle.biz;
 
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
-import com.xxfc.platform.vehicle.entity.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;

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

 package com.xxfc.platform.vehicle.mapper;
 
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.entity.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import tk.mybatis.mapper.common.Mapper;
 
 /**

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

@@ -9,7 +9,7 @@ import com.xxfc.platform.vehicle.biz.VehicleModelBiz;
 import com.xxfc.platform.vehicle.biz.VehiclePlatCataBiz;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.entity.VehicleModel;
-import com.xxfc.platform.vehicle.entity.VehicleModelQueryCondition;
+import com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition;
 import com.xxfc.platform.vehicle.pojo.VModelDetailVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;

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

@@ -4,9 +4,19 @@
   <select id="findVehicleModelPage" parameterType="com.xxfc.platform.vehicle.entity.VehicleModel"
           parameterMap="vehicleModel">
       select  * from  vehicle_model vm left join  vehicle v on vm.id=v.model_id and 1=1
-      <if test="">
+      <if test="vmqc.vehicleType!=null and vmqc.vehicleType!=''">
+       and  v.keyword like CONCAT('%,',#{vmqc.vehicleType},',%')
+      </if>
+
+      <if test="vmqc.vehicleName!=null and vmqc.vehicleName!=''">
+          and  v.name like CONCAT('%',#{vmqc.vehicleName},'%')
+      </if>
 
+      <if test="vmqc.takeAlieTheNumber!=null and vmqc.takeAlieTheNumber!=''">
+       and
       </if>
+
+
   </select>
 
 </mapper>
\ No newline at end of file