diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java
index efec6dba16..3077e8201b 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseDetailsVo.java
@@ -26,6 +26,7 @@
 package com.yxt.anrui.base.api.baseinternalpurchase;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleVo;
 import com.yxt.common.core.vo.Vo;
 
@@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -54,6 +56,9 @@ public class BaseInternalPurchaseDetailsVo implements Vo {
 
     private String sid; // sid
 
+    @ApiModelProperty("申请日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime; // 申请日期
 	@ApiModelProperty("申请编号")
     private String applyNo; // 申请编号
 	@ApiModelProperty("申请人姓名")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java
index e611270fea..d7201bdec5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseQuery.java
@@ -55,8 +55,8 @@ public class BaseInternalPurchaseQuery implements Query {
     private String createStartTime; // 申请开始日期
     @ApiModelProperty("申请结束日期")
     private String createEndTime; // 申请结束日期
-	@ApiModelProperty("售方机构名称")
-    private String sellerOrgName; // 售方机构名称
+	@ApiModelProperty("售方机构sid")
+    private String sellerOrgSid; // 售方机构sid
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
 
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java
index 36cea1d72a..c8a0791acd 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleDto.java
@@ -65,5 +65,6 @@ public class BaseInternalPurchaseVehicleDto implements Dto {
     private String freight; // 运费
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
-
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 }
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java
index 15d8aa576b..b0fe972ee6 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchasevehicle/BaseInternalPurchaseVehicleVo.java
@@ -65,5 +65,6 @@ public class BaseInternalPurchaseVehicleVo implements Vo {
     private String freight; // 运费
 	@ApiModelProperty("车架号")
     private String vinNo; // 车架号
-
+    @ApiModelProperty("备注")
+    private String remarks; // 备注
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryFeign.java
index 0b8a7f6bb7..cae9920fee 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryFeign.java
@@ -60,34 +60,14 @@ public interface BusVehicleInquiryFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusVehicleInquiryVo>> listPage(@RequestBody PagerQuery<BusVehicleInquiryQuery> pq);
 
-    @ApiOperation("根据条件查询所有数据列表")
-    @PostMapping("/listAll")
-    public ResultBean<List<BusVehicleInquiryVo>> listAll(@RequestBody BusVehicleInquiryQuery query);
-
-    @ApiOperation("所有数据列表")
-    @GetMapping("/list")
-    public ResultBean<List<BusVehicleInquiryVo>> list();
-
-    @ApiOperation("新增保存")
+    @ApiOperation("新增修改保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody BusVehicleInquiryDto dto);
 
-    @ApiOperation("修改保存")
-    @PostMapping("/update/{sid}")
-    public ResultBean update(@RequestBody BusVehicleInquiryDto dto, @PathVariable("sid") String sid);
-
-    @ApiOperation("删除记录")
-    @GetMapping("/del/{ids}")
-    public ResultBean del(@PathVariable("ids") String ids);
-
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids);
 
-    @ApiOperation("获取一条记录")
-    @GetMapping("/fetch/{id}")
-    public ResultBean<BusVehicleInquiryVo> fetch(@PathVariable("id") String id);
-
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<BusVehicleInquiryVo> fetchBySid(@PathVariable("sid") String sid);
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryFeignFallback.java
index 2dbcf8cd32..fdf327d62a 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryFeignFallback.java
@@ -54,44 +54,16 @@ public class BusVehicleInquiryFeignFallback implements BusVehicleInquiryFeign {
 		return rb.setMsg("接口anrui-base/busvehicleinquiry/listPage无法访问");
 	}
 
-    @Override
-    public ResultBean<List<BusVehicleInquiryVo>> listAll(BusVehicleInquiryQuery query){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-base/busvehicleinquiry/listAll无法访问");
-	}
-
-	@Override
-	public ResultBean<List<BusVehicleInquiryVo>> list(){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-base/busvehicleinquiry/list无法访问");
-	}
-
 	@Override
 	public ResultBean save(BusVehicleInquiryDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleinquiry/save无法访问");
 	}
 
-	@Override
-	public ResultBean update(BusVehicleInquiryDto dto, String sid){
-		return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleinquiry/update无法访问");
-	}
-
-	@Override
-	public ResultBean del(String ids){
-		return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleinquiry/del无法访问");
-	}
-
 	@Override
 	public ResultBean delBySids( String[] sids){
 		return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleinquiry/delBySids无法访问");
 	}
 
-	@Override
-	public ResultBean<BusVehicleInquiryVo> fetch(String id){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-base/busvehicleinquiry/fetch无法访问");
-	}
-
 	@Override
 	public ResultBean<BusVehicleInquiryVo> fetchBySid(String sid){
 		ResultBean rb = ResultBean.fireFail();
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryQuery.java
index 1f98de6770..45cd8272d5 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryQuery.java
@@ -30,6 +30,7 @@ import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * Project: anrui-base(车型信息) <br/>
@@ -45,126 +46,17 @@ import io.swagger.annotations.ApiModelProperty;
  * @since 1.0
  */
 @ApiModel(value = "车型询价单 查询条件", description = "车型询价单 查询条件")
+@Data
 public class BusVehicleInquiryQuery implements Query {
 
-    
-	@ApiModelProperty("询价日期")
-    private String inquiryDate; // 询价日期
-    
-	@ApiModelProperty("询价人")
-    private String inquirer; // 询价人
-    
+	@ApiModelProperty("询价开始日期")
+    private String inquiryStartDate; // 询价开始日期
+	@ApiModelProperty("询价结束日期")
+	private String inquiryEndDate; // 询价结束日期
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-    
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
-    
 	@ApiModelProperty("车型名称")
-    private String modelName; // 车型名称
-    
-	@ApiModelProperty("车型简述配置")
-    private String modelBriefConfiguration; // 车型简述配置
-    
-	@ApiModelProperty("其它配置说明")
-    private String otherConfig; // 其它配置说明
-
-	
-	/**
-	 * @return 询价日期
-	 */
-	public String getInquiryDate(){
-		return inquiryDate;
-	}
-	
-	/**
-	 * @param inquiryDate 询价日期 to set
-	 */
-	public void setInquiryDate(String inquiryDate){
-		this.inquiryDate = inquiryDate;
-	}
-	
-	/**
-	 * @return 询价人
-	 */
-	public String getInquirer(){
-		return inquirer;
-	}
-	
-	/**
-	 * @param inquirer 询价人 to set
-	 */
-	public void setInquirer(String inquirer){
-		this.inquirer = inquirer;
-	}
-	
-	/**
-	 * @return 创建组织sid
-	 */
-	public String getCreateOrgSid(){
-		return createOrgSid;
-	}
-	
-	/**
-	 * @param createOrgSid 创建组织sid to set
-	 */
-	public void setCreateOrgSid(String createOrgSid){
-		this.createOrgSid = createOrgSid;
-	}
-	
-	/**
-	 * @return 品牌sid
-	 */
-	public String getBrandSid(){
-		return brandSid;
-	}
-	
-	/**
-	 * @param brandSid 品牌sid to set
-	 */
-	public void setBrandSid(String brandSid){
-		this.brandSid = brandSid;
-	}
-	
-	/**
-	 * @return 车型名称
-	 */
-	public String getModelName(){
-		return modelName;
-	}
-	
-	/**
-	 * @param modelName 车型名称 to set
-	 */
-	public void setModelName(String modelName){
-		this.modelName = modelName;
-	}
-	
-	/**
-	 * @return 车型简述配置
-	 */
-	public String getModelBriefConfiguration(){
-		return modelBriefConfiguration;
-	}
-	
-	/**
-	 * @param modelBriefConfiguration 车型简述配置 to set
-	 */
-	public void setModelBriefConfiguration(String modelBriefConfiguration){
-		this.modelBriefConfiguration = modelBriefConfiguration;
-	}
-	
-	/**
-	 * @return 其它配置说明
-	 */
-	public String getOtherConfig(){
-		return otherConfig;
-	}
-	
-	/**
-	 * @param otherConfig 其它配置说明 to set
-	 */
-	public void setOtherConfig(String otherConfig){
-		this.otherConfig = otherConfig;
-	}
+    private String vehModelName; // 车型名称
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryVo.java
index 6d005bb268..1505377e30 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleinquiry/BusVehicleInquiryVo.java
@@ -30,6 +30,7 @@ import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * Project: anrui-base(车型信息) <br/>
@@ -45,126 +46,17 @@ import io.swagger.annotations.ApiModelProperty;
  * @since 1.0
  */
 @ApiModel(value = "车型询价单 视图数据对象", description = "车型询价单 视图数据对象")
+@Data
 public class BusVehicleInquiryVo implements Vo {
 
-    
+	@ApiModelProperty("sid")
+	private String sid; // sid
 	@ApiModelProperty("询价日期")
-    private String inquiryDate; // 询价日期
-    
+    private String createTime; // 询价日期
 	@ApiModelProperty("询价人")
     private String inquirer; // 询价人
-    
-	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
-    
-	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-    
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌sid
 	@ApiModelProperty("车型名称")
-    private String modelName; // 车型名称
-    
-	@ApiModelProperty("车型简述配置")
-    private String modelBriefConfiguration; // 车型简述配置
-    
-	@ApiModelProperty("其它配置说明")
-    private String otherConfig; // 其它配置说明
-
-	
-	/**
-	 * @return 询价日期
-	 */
-	public String getInquiryDate(){
-		return inquiryDate;
-	}
-	
-	/**
-	 * @param inquiryDate 询价日期 to set
-	 */
-	public void setInquiryDate(String inquiryDate){
-		this.inquiryDate = inquiryDate;
-	}
-	
-	/**
-	 * @return 询价人
-	 */
-	public String getInquirer(){
-		return inquirer;
-	}
-	
-	/**
-	 * @param inquirer 询价人 to set
-	 */
-	public void setInquirer(String inquirer){
-		this.inquirer = inquirer;
-	}
-	
-	/**
-	 * @return 创建组织sid
-	 */
-	public String getCreateOrgSid(){
-		return createOrgSid;
-	}
-	
-	/**
-	 * @param createOrgSid 创建组织sid to set
-	 */
-	public void setCreateOrgSid(String createOrgSid){
-		this.createOrgSid = createOrgSid;
-	}
-	
-	/**
-	 * @return 品牌sid
-	 */
-	public String getBrandSid(){
-		return brandSid;
-	}
-	
-	/**
-	 * @param brandSid 品牌sid to set
-	 */
-	public void setBrandSid(String brandSid){
-		this.brandSid = brandSid;
-	}
-	
-	/**
-	 * @return 车型名称
-	 */
-	public String getModelName(){
-		return modelName;
-	}
-	
-	/**
-	 * @param modelName 车型名称 to set
-	 */
-	public void setModelName(String modelName){
-		this.modelName = modelName;
-	}
-	
-	/**
-	 * @return 车型简述配置
-	 */
-	public String getModelBriefConfiguration(){
-		return modelBriefConfiguration;
-	}
-	
-	/**
-	 * @param modelBriefConfiguration 车型简述配置 to set
-	 */
-	public void setModelBriefConfiguration(String modelBriefConfiguration){
-		this.modelBriefConfiguration = modelBriefConfiguration;
-	}
-	
-	/**
-	 * @return 其它配置说明
-	 */
-	public String getOtherConfig(){
-		return otherConfig;
-	}
-	
-	/**
-	 * @param otherConfig 其它配置说明 to set
-	 */
-	public void setOtherConfig(String otherConfig){
-		this.otherConfig = otherConfig;
-	}
+    private String vehModelName; // 车型名称
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeign.java
index f075a9f565..f734a2719b 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeign.java
@@ -60,34 +60,14 @@ public interface BusVehicleOfferFeign {
     @PostMapping("/listPage")
     public ResultBean<PagerVo<BusVehicleOfferVo>> listPage(@RequestBody PagerQuery<BusVehicleOfferQuery> pq);
 
-    @ApiOperation("根据条件查询所有数据列表")
-    @PostMapping("/listAll")
-    public ResultBean<List<BusVehicleOfferVo>> listAll(@RequestBody BusVehicleOfferQuery query);
-
-    @ApiOperation("所有数据列表")
-    @GetMapping("/list")
-    public ResultBean<List<BusVehicleOfferVo>> list();
-
-    @ApiOperation("新增保存")
+    @ApiOperation("新增修改保存")
     @PostMapping("/save")
     public ResultBean save(@RequestBody BusVehicleOfferDto dto);
       
-    @ApiOperation("修改保存")
-    @PostMapping("/update/{sid}")
-    public ResultBean update(@RequestBody BusVehicleOfferDto dto, @PathVariable("sid") String sid);
-
-    @ApiOperation("删除记录")
-    @GetMapping("/del/{ids}")
-    public ResultBean del(@PathVariable("ids") String ids);
-      
     @ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids);
 
-    @ApiOperation("获取一条记录")
-    @GetMapping("/fetch/{id}")
-    public ResultBean<BusVehicleOfferVo> fetch(@PathVariable("id") String id);
-      
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<BusVehicleOfferVo> fetchBySid(@PathVariable("sid") String sid);
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeignFallback.java
index c81cff3371..e51faa22af 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferFeignFallback.java
@@ -54,44 +54,16 @@ public class BusVehicleOfferFeignFallback implements BusVehicleOfferFeign {
 		return rb.setMsg("接口anrui-base/busvehicleoffer/listPage无法访问");
 	}
 
-    @Override
-    public ResultBean<List<BusVehicleOfferVo>> listAll(BusVehicleOfferQuery query){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-base/busvehicleoffer/listAll无法访问");
-	}
-
-	@Override
-	public ResultBean<List<BusVehicleOfferVo>> list(){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-base/busvehicleoffer/list无法访问");
-	}
-
 	@Override
 	public ResultBean save(BusVehicleOfferDto dto){
 		return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleoffer/save无法访问");
 	}
 
-	@Override
-	public ResultBean update(BusVehicleOfferDto dto, String sid){
-		return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleoffer/update无法访问");
-	}
-
-	@Override
-	public ResultBean del(String ids){
-		return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleoffer/del无法访问");
-	}
-
 	@Override
 	public ResultBean delBySids( String[] sids){
 		return ResultBean.fireFail().setMsg("接口anrui-base/busvehicleoffer/delBySids无法访问");
 	}
 
-	@Override
-	public ResultBean<BusVehicleOfferVo> fetch(String id){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-base/busvehicleoffer/fetch无法访问");
-	}
-
 	@Override
 	public ResultBean<BusVehicleOfferVo> fetchBySid(String sid){
 		ResultBean rb = ResultBean.fireFail();
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferQuery.java
index 0bf91c7906..923a2c5331 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferQuery.java
@@ -30,6 +30,7 @@ import com.yxt.common.core.query.Query;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * Project: anrui-base(车型信息) <br/>
@@ -45,194 +46,17 @@ import io.swagger.annotations.ApiModelProperty;
  * @since 1.0
  */
 @ApiModel(value = "车型报价单 查询条件", description = "车型报价单 查询条件")
+@Data
 public class BusVehicleOfferQuery implements Query {
 
-    
-	@ApiModelProperty("询价单sid")
-    private String inquirySid; // 询价单sid
-    
-	@ApiModelProperty("报价人")
-    private String offerPeoplea; // 报价人
-    
-	@ApiModelProperty("报价日期")
-    private String offerDate; // 报价日期
-    
+	@ApiModelProperty("报价开始日期")
+    private String offerStartDate; // 报价开始日期
+	@ApiModelProperty("报价结束日期")
+	private String offerEndDate; // 报价结束日期
 	@ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-    
 	@ApiModelProperty("品牌sid")
     private String brandSid; // 品牌sid
-    
-	@ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
-    
-	@ApiModelProperty("车型简述配置sid")
-    private String modelBriefConfigurationSid; // 车型简述配置sid
-    
-	@ApiModelProperty("特殊或差异说明")
-    private String specialInstructions; // 特殊或差异说明
-    
-	@ApiModelProperty("厂家结算价")
-    private String manufacturerSettlementPrice; // 厂家结算价
-    
-	@ApiModelProperty("销售参考价")
-    private String salesReferencePrice; // 销售参考价
-    
-	@ApiModelProperty("价格有效期")
-    private String priceValidity; // 价格有效期
-
-	
-	/**
-	 * @return 询价单sid
-	 */
-	public String getInquirySid(){
-		return inquirySid;
-	}
-	
-	/**
-	 * @param inquirySid 询价单sid to set
-	 */
-	public void setInquirySid(String inquirySid){
-		this.inquirySid = inquirySid;
-	}
-	
-	/**
-	 * @return 报价人
-	 */
-	public String getOfferPeoplea(){
-		return offerPeoplea;
-	}
-	
-	/**
-	 * @param offerPeoplea 报价人 to set
-	 */
-	public void setOfferPeoplea(String offerPeoplea){
-		this.offerPeoplea = offerPeoplea;
-	}
-	
-	/**
-	 * @return 报价日期
-	 */
-	public String getOfferDate(){
-		return offerDate;
-	}
-	
-	/**
-	 * @param offerDate 报价日期 to set
-	 */
-	public void setOfferDate(String offerDate){
-		this.offerDate = offerDate;
-	}
-	
-	/**
-	 * @return 创建组织sid
-	 */
-	public String getCreateOrgSid(){
-		return createOrgSid;
-	}
-	
-	/**
-	 * @param createOrgSid 创建组织sid to set
-	 */
-	public void setCreateOrgSid(String createOrgSid){
-		this.createOrgSid = createOrgSid;
-	}
-	
-	/**
-	 * @return 品牌sid
-	 */
-	public String getBrandSid(){
-		return brandSid;
-	}
-	
-	/**
-	 * @param brandSid 品牌sid to set
-	 */
-	public void setBrandSid(String brandSid){
-		this.brandSid = brandSid;
-	}
-	
-	/**
-	 * @return 车型sid
-	 */
-	public String getModelSid(){
-		return modelSid;
-	}
-	
-	/**
-	 * @param modelSid 车型sid to set
-	 */
-	public void setModelSid(String modelSid){
-		this.modelSid = modelSid;
-	}
-	
-	/**
-	 * @return 车型简述配置sid
-	 */
-	public String getModelBriefConfigurationSid(){
-		return modelBriefConfigurationSid;
-	}
-	
-	/**
-	 * @param modelBriefConfigurationSid 车型简述配置sid to set
-	 */
-	public void setModelBriefConfigurationSid(String modelBriefConfigurationSid){
-		this.modelBriefConfigurationSid = modelBriefConfigurationSid;
-	}
-	
-	/**
-	 * @return 特殊或差异说明
-	 */
-	public String getSpecialInstructions(){
-		return specialInstructions;
-	}
-	
-	/**
-	 * @param specialInstructions 特殊或差异说明 to set
-	 */
-	public void setSpecialInstructions(String specialInstructions){
-		this.specialInstructions = specialInstructions;
-	}
-	
-	/**
-	 * @return 厂家结算价
-	 */
-	public String getManufacturerSettlementPrice(){
-		return manufacturerSettlementPrice;
-	}
-	
-	/**
-	 * @param manufacturerSettlementPrice 厂家结算价 to set
-	 */
-	public void setManufacturerSettlementPrice(String manufacturerSettlementPrice){
-		this.manufacturerSettlementPrice = manufacturerSettlementPrice;
-	}
-	
-	/**
-	 * @return 销售参考价
-	 */
-	public String getSalesReferencePrice(){
-		return salesReferencePrice;
-	}
-	
-	/**
-	 * @param salesReferencePrice 销售参考价 to set
-	 */
-	public void setSalesReferencePrice(String salesReferencePrice){
-		this.salesReferencePrice = salesReferencePrice;
-	}
-	
-	/**
-	 * @return 价格有效期
-	 */
-	public String getPriceValidity(){
-		return priceValidity;
-	}
-	
-	/**
-	 * @param priceValidity 价格有效期 to set
-	 */
-	public void setPriceValidity(String priceValidity){
-		this.priceValidity = priceValidity;
-	}
+	@ApiModelProperty("车型名称")
+	private String vehModelName; // 车型名称
 }
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferVo.java
index 293e37cb52..f8e818ce0b 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleoffer/BusVehicleOfferVo.java
@@ -30,6 +30,7 @@ import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
 
 /**
  * Project: anrui-base(车型信息) <br/>
@@ -45,194 +46,23 @@ import io.swagger.annotations.ApiModelProperty;
  * @since 1.0
  */
 @ApiModel(value = "车型报价单 视图数据对象", description = "车型报价单 视图数据对象")
+@Data
 public class BusVehicleOfferVo implements Vo {
 
-    
-	@ApiModelProperty("询价单sid")
-    private String inquirySid; // 询价单sid
-    
-	@ApiModelProperty("报价人")
-    private String offerPeoplea; // 报价人
-    
+	@ApiModelProperty("sid")
+	private String sid; // sid
 	@ApiModelProperty("报价日期")
-    private String offerDate; // 报价日期
-    
-	@ApiModelProperty("创建组织sid")
-    private String createOrgSid; // 创建组织sid
-    
-	@ApiModelProperty("品牌sid")
-    private String brandSid; // 品牌sid
-    
-	@ApiModelProperty("车型sid")
-    private String modelSid; // 车型sid
-    
-	@ApiModelProperty("车型简述配置sid")
-    private String modelBriefConfigurationSid; // 车型简述配置sid
-    
+    private String createTime; // 报价日期
+	@ApiModelProperty("品牌名称")
+	private String brandName; // 品牌sid
+	@ApiModelProperty("车型名称")
+	private String vehModelName; // 车型名称
 	@ApiModelProperty("特殊或差异说明")
     private String specialInstructions; // 特殊或差异说明
-    
 	@ApiModelProperty("厂家结算价")
-    private String manufacturerSettlementPrice; // 厂家结算价
-    
+    private String costPrice; // 厂家结算价
 	@ApiModelProperty("销售参考价")
-    private String salesReferencePrice; // 销售参考价
-    
+    private String salePrice; // 销售参考价
 	@ApiModelProperty("价格有效期")
     private String priceValidity; // 价格有效期
-
-	
-	/**
-	 * @return 询价单sid
-	 */
-	public String getInquirySid(){
-		return inquirySid;
-	}
-	
-	/**
-	 * @param inquirySid 询价单sid to set
-	 */
-	public void setInquirySid(String inquirySid){
-		this.inquirySid = inquirySid;
-	}
-	
-	/**
-	 * @return 报价人
-	 */
-	public String getOfferPeoplea(){
-		return offerPeoplea;
-	}
-	
-	/**
-	 * @param offerPeoplea 报价人 to set
-	 */
-	public void setOfferPeoplea(String offerPeoplea){
-		this.offerPeoplea = offerPeoplea;
-	}
-	
-	/**
-	 * @return 报价日期
-	 */
-	public String getOfferDate(){
-		return offerDate;
-	}
-	
-	/**
-	 * @param offerDate 报价日期 to set
-	 */
-	public void setOfferDate(String offerDate){
-		this.offerDate = offerDate;
-	}
-	
-	/**
-	 * @return 创建组织sid
-	 */
-	public String getCreateOrgSid(){
-		return createOrgSid;
-	}
-	
-	/**
-	 * @param createOrgSid 创建组织sid to set
-	 */
-	public void setCreateOrgSid(String createOrgSid){
-		this.createOrgSid = createOrgSid;
-	}
-	
-	/**
-	 * @return 品牌sid
-	 */
-	public String getBrandSid(){
-		return brandSid;
-	}
-	
-	/**
-	 * @param brandSid 品牌sid to set
-	 */
-	public void setBrandSid(String brandSid){
-		this.brandSid = brandSid;
-	}
-	
-	/**
-	 * @return 车型sid
-	 */
-	public String getModelSid(){
-		return modelSid;
-	}
-	
-	/**
-	 * @param modelSid 车型sid to set
-	 */
-	public void setModelSid(String modelSid){
-		this.modelSid = modelSid;
-	}
-	
-	/**
-	 * @return 车型简述配置sid
-	 */
-	public String getModelBriefConfigurationSid(){
-		return modelBriefConfigurationSid;
-	}
-	
-	/**
-	 * @param modelBriefConfigurationSid 车型简述配置sid to set
-	 */
-	public void setModelBriefConfigurationSid(String modelBriefConfigurationSid){
-		this.modelBriefConfigurationSid = modelBriefConfigurationSid;
-	}
-	
-	/**
-	 * @return 特殊或差异说明
-	 */
-	public String getSpecialInstructions(){
-		return specialInstructions;
-	}
-	
-	/**
-	 * @param specialInstructions 特殊或差异说明 to set
-	 */
-	public void setSpecialInstructions(String specialInstructions){
-		this.specialInstructions = specialInstructions;
-	}
-	
-	/**
-	 * @return 厂家结算价
-	 */
-	public String getManufacturerSettlementPrice(){
-		return manufacturerSettlementPrice;
-	}
-	
-	/**
-	 * @param manufacturerSettlementPrice 厂家结算价 to set
-	 */
-	public void setManufacturerSettlementPrice(String manufacturerSettlementPrice){
-		this.manufacturerSettlementPrice = manufacturerSettlementPrice;
-	}
-	
-	/**
-	 * @return 销售参考价
-	 */
-	public String getSalesReferencePrice(){
-		return salesReferencePrice;
-	}
-	
-	/**
-	 * @param salesReferencePrice 销售参考价 to set
-	 */
-	public void setSalesReferencePrice(String salesReferencePrice){
-		this.salesReferencePrice = salesReferencePrice;
-	}
-	
-	/**
-	 * @return 价格有效期
-	 */
-	public String getPriceValidity(){
-		return priceValidity;
-	}
-	
-	/**
-	 * @param priceValidity 价格有效期 to set
-	 */
-	public void setPriceValidity(String priceValidity){
-		this.priceValidity = priceValidity;
-	}
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml
index ab33d70aed..da3806d53b 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseMapper.xml
@@ -4,7 +4,7 @@
 <!--    <where> ${ew.sqlSegment} </where>-->
 <!--    ${ew.customSqlSegment} -->
 	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseVo">
-		SELECT
+		SELECT DISTINCT
 		bip.sid,
 		bip.`applyNo`,
 		bip.`applyPeoName`,
@@ -15,7 +15,7 @@
 		COUNT(*)
 		FROM
 		base_internal_purchase_vehicle
-		WHERE bipv.`mainSid` = bip.`sid`) num
+		WHERE `mainSid` = bip.`sid`) num
 		FROM
 		base_internal_purchase bip
 		LEFT JOIN base_internal_purchase_vehicle bipv
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
index 4c7b6d9383..9069b07e54 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseRest.java
@@ -80,7 +80,7 @@ public class BaseInternalPurchaseRest implements BaseInternalPurchaseFeign {
 
 	@Override
 	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
+    @DeleteMapping("/delBySids")
     public ResultBean delBySids(@RequestBody String[] sids){
 		return baseInternalPurchaseService.delAll(sids);
 	}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
index 8820e48f45..cace663553 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseinternalpurchase/BaseInternalPurchaseService.java
@@ -88,8 +88,8 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
 		if (StringUtils.isNotBlank(query.getNodeState())){
 			//qw.eq("bip.nodeState",query.getNodeState());
 		}
-		if (StringUtils.isNotBlank(query.getSellerOrgName())){
-			qw.like("bip.sellerOrgName",query.getSellerOrgName());
+		if (StringUtils.isNotBlank(query.getSellerOrgSid())){
+			qw.like("bip.sellerOrgSid",query.getSellerOrgSid());
 		}
 		IPage<BaseInternalPurchase> page = PagerUtil.queryToPage(pq);
 		IPage<BaseInternalPurchaseVo> pagging = baseMapper.selectPageVo(page, qw);
@@ -112,6 +112,10 @@ public class BaseInternalPurchaseService extends MybatisBaseService<BaseInternal
 		String dtoSid = dto.getSid();
 		List<BaseInternalPurchaseVehicleDto> baseInternalPurchaseVehicles = dto.getBaseInternalPurchaseVehicles();
 		if (StringUtils.isBlank(dtoSid)) {//新增
+			String sellerOrgName = dto.getSellerOrgName();
+			if (StringUtils.isBlank(sellerOrgName)){
+				return rb.setMsg("售方机构不能为空");
+			}
 			BaseInternalPurchase baseInternalPurchase = new BaseInternalPurchase();
 			String sid = baseInternalPurchase.getSid();
 			BeanUtil.copyProperties(dto,baseInternalPurchase);
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryMapper.java
index 90d1b510db..371038d7dc 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryMapper.java
@@ -29,8 +29,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.base.api.busvehicleinquiry.AppBusVehicleInquiryListQuery;
-import com.yxt.anrui.base.api.busvehicleinquiry.AppBusVehicleInquiryListVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryRest.java
index 44c55613a8..56be912d95 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryRest.java
@@ -68,24 +68,6 @@ public class BusVehicleInquiryRest implements BusVehicleInquiryFeign {
 		return rb.success().setData(pv);
 	}
 
-	@Override
-	@ApiOperation("根据条件查询所有数据列表")
-	@PostMapping("/listAll")
-	public ResultBean<List<BusVehicleInquiryVo>> listAll(@RequestBody BusVehicleInquiryQuery query){
-		ResultBean rb = ResultBean.fireFail();
-		List<BusVehicleInquiryVo> list = busVehicleInquiryService.listAllVo(query);
-		return rb.success().setData(list);
-	}
-
-	@Override
-	@ApiOperation("所有数据列表")
-	@GetMapping("/list")
-	public ResultBean<List<BusVehicleInquiryVo>> list(){
-		ResultBean rb = ResultBean.fireFail();
-		List<BusVehicleInquiryVo> list = busVehicleInquiryService.listVo();
-		return rb.success().setData(list);
-	}
-
 	@Override
 	@ApiOperation("新增保存")
 	@PostMapping("/save")
@@ -95,24 +77,6 @@ public class BusVehicleInquiryRest implements BusVehicleInquiryFeign {
 		return rb.success();
 	}
 
-	@Override
-	@ApiOperation("修改保存")
-	@PostMapping("/update/{sid}")
-	public ResultBean update(@RequestBody BusVehicleInquiryDto dto, @PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		busVehicleInquiryService.updateBySid(dto.toMap(),sid);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("删除记录")
-	@GetMapping("/del/{ids}")
-	public ResultBean del(@PathVariable("ids") String ids){
-		ResultBean rb = ResultBean.fireFail();
-		busVehicleInquiryService.delByIds(ids);
-		return rb.success();
-	}
-
 	@Override
 	@ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
@@ -122,15 +86,6 @@ public class BusVehicleInquiryRest implements BusVehicleInquiryFeign {
 		return rb.success();
 	}
 
-	@Override
-	@ApiOperation("获取一条记录")
-	@GetMapping("/fetch/{id}")
-	public ResultBean<BusVehicleInquiryVo> fetch(@PathVariable("id") String id){
-		ResultBean rb = ResultBean.fireFail();
-		BusVehicleInquiryVo vo = busVehicleInquiryService.fetchByIdVo(id);
-		return rb.success().setData(vo);
-	}
-
 	@Override
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java
index 317b071a84..d2cb78b444 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleinquiry/BusVehicleInquiryService.java
@@ -77,70 +77,27 @@ public class BusVehicleInquiryService extends MybatisBaseService<BusVehicleInqui
     @Autowired
     BaseModelConfigService baseModelConfigService;
 
-    public PagerVo<BusVehicleInquiry> listPage(PagerQuery<BusVehicleInquiryQuery> pq) {
+    public PagerVo<BusVehicleInquiryVo> listPageVo(PagerQuery<BusVehicleInquiryQuery> pq) {
         BusVehicleInquiryQuery query = pq.getParams();
-        QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
-        IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
-        IPage<BusVehicleInquiry> pagging = baseMapper.selectPage(page, qw);
-        PagerVo<BusVehicleInquiry> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public List<BusVehicleInquiry> listAll(BusVehicleInquiryQuery query) {
-        QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
-        return baseMapper.selectList(qw);
-    }
-
-    private QueryWrapper<BusVehicleInquiry> createQueryWrapper(BusVehicleInquiryQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
         QueryWrapper<BusVehicleInquiry> qw = new QueryWrapper<>();
-
-
-        if (StringUtils.isNotBlank(query.getInquiryDate())) {
-            qw.eq("inquiryDate", query.getInquiryDate());
-        }
-
-        if (StringUtils.isNotBlank(query.getInquirer())) {
-            qw.eq("inquirer", query.getInquirer());
-        }
-
-        if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
-            qw.eq("createOrgSid", query.getCreateOrgSid());
-        }
-
+        qw.eq("createOrgSid", query.getCreateOrgSid());
         if (StringUtils.isNotBlank(query.getBrandSid())) {
             qw.eq("brandSid", query.getBrandSid());
         }
-
-        if (StringUtils.isNotBlank(query.getModelName())) {
-            qw.eq("modelName", query.getModelName());
-        }
-
-        if (StringUtils.isNotBlank(query.getModelBriefConfiguration())) {
-            qw.eq("modelBriefConfiguration", query.getModelBriefConfiguration());
-        }
-
-        if (StringUtils.isNotBlank(query.getOtherConfig())) {
-            qw.eq("otherConfig", query.getOtherConfig());
+        if (StringUtils.isNotBlank(query.getVehModelName())) {
+            qw.eq("vehModelName", query.getVehModelName());
         }
-        return qw;
-    }
-
-    public PagerVo<BusVehicleInquiryVo> listPageVo(PagerQuery<BusVehicleInquiryQuery> pq) {
-        BusVehicleInquiryQuery query = pq.getParams();
-        QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
+        String inquiryStartDate = query.getInquiryStartDate();
+        String inquiryEndDate = query.getInquiryEndDate();
+        qw.apply(StringUtils.isNotBlank(inquiryStartDate), "date_format (createTime,'%Y-%m-%d') >= date_format('" + inquiryStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotBlank(inquiryEndDate), "date_format (createTime,'%Y-%m-%d') <= date_format('" + inquiryEndDate + "','%Y-%m-%d')"
+                );
         IPage<BusVehicleInquiry> page = PagerUtil.queryToPage(pq);
         IPage<BusVehicleInquiryVo> pagging = baseMapper.selectPageVo(page, qw);
         PagerVo<BusVehicleInquiryVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
 
-    public List<BusVehicleInquiryVo> listAllVo(BusVehicleInquiryQuery query) {
-        QueryWrapper<BusVehicleInquiry> qw = createQueryWrapper(query);
-        return baseMapper.selectListAllVo(qw);
-    }
-
     public List<BusVehicleInquiryVo> listVo() {
         return baseMapper.selectListVo();
     }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferRest.java
index e98dffd0d7..9dfffc4e48 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferRest.java
@@ -70,24 +70,6 @@ public class BusVehicleOfferRest implements BusVehicleOfferFeign {
 		return rb.success().setData(pv);
 	}
 
-	@Override
-	@ApiOperation("根据条件查询所有数据列表")
-	@PostMapping("/listAll")
-	public ResultBean<List<BusVehicleOfferVo>> listAll(@RequestBody BusVehicleOfferQuery query){
-		ResultBean rb = ResultBean.fireFail();
-		List<BusVehicleOfferVo> list = busVehicleOfferService.listAllVo(query);
-		return rb.success().setData(list);
-	}
-
-	@Override
-	@ApiOperation("所有数据列表")
-	@GetMapping("/list")
-	public ResultBean<List<BusVehicleOfferVo>> list(){
-		ResultBean rb = ResultBean.fireFail();
-		List<BusVehicleOfferVo> list = busVehicleOfferService.listVo();
-		return rb.success().setData(list);
-	}
-
 	@Override
 	@ApiOperation("新增保存")
 	@PostMapping("/save")
@@ -97,24 +79,6 @@ public class BusVehicleOfferRest implements BusVehicleOfferFeign {
 		return rb.success();
 	}
 
-	@Override
-	@ApiOperation("修改保存")
-	@PostMapping("/update/{sid}")
-	public ResultBean update(@RequestBody BusVehicleOfferDto dto, @PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		busVehicleOfferService.updateBySid(dto.toMap(),sid);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("删除记录")
-	@GetMapping("/del/{ids}")
-	public ResultBean del(@PathVariable("ids") String ids){
-		ResultBean rb = ResultBean.fireFail();
-		busVehicleOfferService.delByIds(ids);
-		return rb.success();
-	}
-
 	@Override
 	@ApiOperation("根据sid批量删除")
     @PostMapping("/delBySids")
@@ -124,15 +88,6 @@ public class BusVehicleOfferRest implements BusVehicleOfferFeign {
 		return rb.success();
 	}
 
-	@Override
-	@ApiOperation("获取一条记录")
-	@GetMapping("/fetch/{id}")
-	public ResultBean<BusVehicleOfferVo> fetch(@PathVariable("id") String id){
-		ResultBean rb = ResultBean.fireFail();
-		BusVehicleOfferVo vo = busVehicleOfferService.fetchByIdVo(id);
-		return rb.success().setData(vo);
-	}
-
 	@Override
 	@ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java
index abef553c94..e031f8878a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleoffer/BusVehicleOfferService.java
@@ -59,88 +59,28 @@ import java.util.List;
  */
 @Service
 public class BusVehicleOfferService extends MybatisBaseService<BusVehicleOfferMapper, BusVehicleOffer> {
-	public PagerVo<BusVehicleOffer> listPage(PagerQuery<BusVehicleOfferQuery> pq) {
+
+	public PagerVo<BusVehicleOfferVo> listPageVo(PagerQuery<BusVehicleOfferQuery> pq) {
 		BusVehicleOfferQuery query = pq.getParams();
-		QueryWrapper<BusVehicleOffer> qw = createQueryWrapper(query);
-		IPage<BusVehicleOffer> page = PagerUtil.queryToPage(pq);
-		IPage<BusVehicleOffer> pagging = baseMapper.selectPage(page, qw);
-		PagerVo<BusVehicleOffer> p = PagerUtil.pageToVo(pagging, null);
-		return p;
-	}
-	public List<BusVehicleOffer> listAll(BusVehicleOfferQuery query) {
-		QueryWrapper<BusVehicleOffer> qw = createQueryWrapper(query);
-		return baseMapper.selectList(qw);
-	}
-	private QueryWrapper<BusVehicleOffer> createQueryWrapper(BusVehicleOfferQuery query) {
-		// todo: 这里根据具体业务调整查询条件
-		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
 		QueryWrapper<BusVehicleOffer> qw = new QueryWrapper<>();
-
-
-		if (StringUtils.isNotBlank(query.getInquirySid())) {
-			qw.eq("inquirySid", query.getInquirySid());
-		}
-
-		if (StringUtils.isNotBlank(query.getOfferPeoplea())) {
-			qw.eq("offerPeoplea", query.getOfferPeoplea());
-		}
-
-		if (StringUtils.isNotBlank(query.getOfferDate())) {
-			qw.eq("offerDate", query.getOfferDate());
-		}
-
-		if (StringUtils.isNotBlank(query.getCreateOrgSid())) {
-			qw.eq("createOrgSid", query.getCreateOrgSid());
-		}
-
+		qw.eq("createOrgSid", query.getCreateOrgSid());
 		if (StringUtils.isNotBlank(query.getBrandSid())) {
 			qw.eq("brandSid", query.getBrandSid());
 		}
-
-		if (StringUtils.isNotBlank(query.getModelSid())) {
-			qw.eq("modelSid", query.getModelSid());
+		if (StringUtils.isNotBlank(query.getVehModelName())) {
+			qw.eq("vehModelName", query.getVehModelName());
 		}
-
-		if (StringUtils.isNotBlank(query.getModelBriefConfigurationSid())) {
-			qw.eq("modelBriefConfigurationSid", query.getModelBriefConfigurationSid());
-		}
-
-		if (StringUtils.isNotBlank(query.getSpecialInstructions())) {
-			qw.eq("specialInstructions", query.getSpecialInstructions());
-		}
-
-		if (StringUtils.isNotBlank(query.getManufacturerSettlementPrice())) {
-			qw.eq("manufacturerSettlementPrice", query.getManufacturerSettlementPrice());
-		}
-
-		if (StringUtils.isNotBlank(query.getSalesReferencePrice())) {
-			qw.eq("salesReferencePrice", query.getSalesReferencePrice());
-		}
-
-		if (StringUtils.isNotBlank(query.getPriceValidity())) {
-			qw.eq("priceValidity", query.getPriceValidity());
-		}
-		return qw;
-	}
-	
-	public PagerVo<BusVehicleOfferVo> listPageVo(PagerQuery<BusVehicleOfferQuery> pq) {
-		BusVehicleOfferQuery query = pq.getParams();
-		QueryWrapper<BusVehicleOffer> qw = createQueryWrapper(query);
+		String offerStartDate = query.getOfferStartDate();
+		String offerEndDate = query.getOfferEndDate();
+		qw.apply(StringUtils.isNotBlank(offerStartDate), "date_format (createTime,'%Y-%m-%d') >= date_format('" + offerStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotBlank(offerEndDate), "date_format (createTime,'%Y-%m-%d') <= date_format('" + offerEndDate + "','%Y-%m-%d')"
+				);
 		IPage<BusVehicleOffer> page = PagerUtil.queryToPage(pq);
 		IPage<BusVehicleOfferVo> pagging = baseMapper.selectPageVo(page, qw);
 		PagerVo<BusVehicleOfferVo> p = PagerUtil.pageToVo(pagging, null);
 		return p;
 	}
 	
-	public List<BusVehicleOfferVo> listAllVo(BusVehicleOfferQuery query) {
-		QueryWrapper<BusVehicleOffer> qw = createQueryWrapper(query);
-		return baseMapper.selectListAllVo(qw);
-	}
-	
-	public List<BusVehicleOfferVo> listVo() {
-		return baseMapper.selectListVo();
-	}
-	
 	public void saveOrUpdateDto(BusVehicleOfferDto dto){
 		BusVehicleOffer entity = new BusVehicleOffer();
 		dto.fillEntity(entity);