Merge branch 'base-modify' of http://113.105.137.151:22280/youjj/cloud-platform into base-modify

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourBanner.java

 package com.xxfc.platform.tour.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -12,7 +11,7 @@ import lombok.NoArgsConstructor;
 
 /**
  * 首页banner图
- * 
+ *
  * @author zjw
  * @email nishijjo@qq.com
  * @date 2019-06-06 11:41:51
@@ -28,66 +27,66 @@ public class TourBanner implements Serializable {
 	/**
 	 * 	首页banner图主键
 	 */
-    @Id
+	@Id
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("首页banner图主键")
-    private Long id;
+	private Long id;
 
 	/**
 	 * 标题
 	 */
 	@Column(name = "title")
 	@ApiModelProperty(value = "标题")
-    private String title;
+	private String title;
 
 	/**
 	 * 封面
 	 */
 	@Column(name = "cover")
 	@ApiModelProperty(value = "封面")
-    private String cover;
+	private String cover;
 
 	/**
 	 * 创建人
 	 */
 	@Column(name = "crt_name")
 	@ApiModelProperty(value = "创建人")
-    private String crtName;
+	private String crtName;
 
 	/**
 	 * 创建时间
 	 */
 	@Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
-    private Long crtTime;
+	private Long crtTime;
 
 	/**
 	 * 更新人
 	 */
 	@Column(name = "upd_name")
 	@ApiModelProperty(value = "更新人")
-    private String updName;
+	private String updName;
 
 	/**
 	 * 修改时间
 	 */
 	@Column(name = "upd_time")
 	@ApiModelProperty(value = "修改时间", hidden = true )
-    private Long updTime;
+	private Long updTime;
 
 	/**
 	 * 跳转链接
 	 */
 	@Column(name = "url")
 	@ApiModelProperty(value = "跳转链接")
-    private String url;
+	private String url;
 
 	/**
 	 * 是否删除，0否，1是
 	 */
 	@Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除，0否，1是")
-    private Integer isDel;
+	private Integer isDel;
 
 	/**
 	 * 排序
@@ -101,6 +100,6 @@ public class TourBanner implements Serializable {
 	 */
 	@Column(name = "type")
 	@ApiModelProperty(value = "banner类型")
-   private Integer  type;
+	private Integer  type;
 
 }

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourBannerBiz.java

@@ -24,7 +24,7 @@ public class TourBannerBiz extends BaseBiz<TourBannerMapper,TourBanner> {
 
     @CacheClear(key = RedisKey.CONSTANT_CODE_PREFIX_BANNER)
     public void update(TourBanner banner) {
-      this.updateSelectiveById(banner);
+        this.updateSelectiveById(banner);
     }
 
 
@@ -47,9 +47,9 @@ public class TourBannerBiz extends BaseBiz<TourBannerMapper,TourBanner> {
      * @return
      */
     public int update(TourBanner banner, AppUserDTO userInfo) {
-         banner.setUpdName(userInfo.getRealname()==null?userInfo.getNickname():userInfo.getRealname());
-         banner.setUpdTime(Instant.now().toEpochMilli());
-      return  mapper.updateByPrimaryKeySelective(banner);
+        banner.setUpdName(userInfo.getRealname()==null?userInfo.getNickname():userInfo.getRealname());
+        banner.setUpdTime(Instant.now().toEpochMilli());
+        return  mapper.updateByPrimaryKeySelective(banner);
     }
 
     /**
@@ -70,9 +70,9 @@ public class TourBannerBiz extends BaseBiz<TourBannerMapper,TourBanner> {
      * @return
      */
     public int save(TourBanner banner, AppUserDTO userInfo) {
-         banner.setCrtName(userInfo.getRealname()==null?userInfo.getNickname():userInfo.getRealname());
-         banner.setCrtTime(Instant.now().toEpochMilli());
-         return mapper.insert(banner);
+        banner.setCrtName(userInfo.getRealname()==null?userInfo.getNickname():userInfo.getRealname());
+        banner.setCrtTime(Instant.now().toEpochMilli());
+        return mapper.insert(banner);
     }
 
     /**

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

@@ -12,9 +12,9 @@ public class VehicleModelQueryCondition {
     @ApiModelProperty(value = "房车型号")
     private String  vehileModel;
     @ApiModelProperty(value = "房车名")
-    private String   vehileName;
+    private String  vehileName;
     @ApiModelProperty(value = "乘卧数")
-    private String   takeALieTheNumber;
+    private String  takeALieTheNumber;
 
 
 }

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

 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
 <mapper namespace="com.xxfc.platform.vehicle.mapper.VehicleModelMapper">
-  <select id="findVehicleModelPage" parameterType="com.xxfc.platform.vehicle.entity.VehicleModel"
-          parameterMap="vehicleModel">
+  <select id="findVehicleModelPage" parameterType="com.xxfc.platform.vehicle.pojo.VehicleModelQueryCondition"
+          resultMap="vehicleModel">
       select  * from  vehicle_model vm left join  vehicle v on vm.id=v.model_id and 1=1
       <if test="vmqc.vehicleType!=null and vmqc.vehicleType!=''">
        and  v.keyword like CONCAT('%,',#{vmqc.vehicleType},',%')
@@ -16,7 +16,9 @@
        and  v.keyword like CONCAT('%,',#{vmqc.takeAlieTheNumber},',%')
       </if>
 
-
   </select>
+    <resultMap id="vehicleModel" type="com.xxfc.platform.vehicle.entity.VehicleModel" >
+       <id property="id" column="id"></id>
+    </resultMap>
 
 </mapper>
\ No newline at end of file