Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.base.api.basediscountpackage;
 
-import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -8,7 +7,6 @@ import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.cloud.openfeign.SpringQueryMap;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -67,6 +65,6 @@ public interface BaseDiscountpackageFeign {
     ResultBean<PagerVo<BaseSalesDicountVo>> selectSalesOrderList(@RequestBody PagerQuery<BaseSalesDicountQuery> query);
 
     @ApiOperation("移动端-销售订单获取销售政策优惠包")
-    @GetMapping("/getAppPackage")
+    @GetMapping("/getAppPackage/{userSid}")
-    ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@SpringQueryMap AppBaseDiscountpackageQuery query);
+    ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@PathVariable(value = "userSid") String userSid);
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java

@@ -26,45 +26,45 @@ import java.util.List;
 public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeign {
 
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<BaseDiscountpackagePageListVo>> listPage(PagerQuery<BaseDiscountpackageQuery> pq) {
+    public ResultBean<PagerVo<BaseDiscountpackagePageListVo>> listPage(PagerQuery<BaseDiscountpackageQuery> pq) {
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean save(BaseDiscountpackageDto dto) {
+    public ResultBean save(BaseDiscountpackageDto dto) {
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean update(BaseDiscountpackageDto dto, String sid) {
+    public ResultBean update(BaseDiscountpackageDto dto, String sid) {
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean deleteBySids(String[] sids) {
+    public ResultBean deleteBySids(String[] sids) {
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<BaseDiscountpackageVo> fetchSid(String sid) {
+    public ResultBean<BaseDiscountpackageVo> fetchSid(String sid) {
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean submitSalesOrderApprove(BaseDiscountpackageDto dto) {
+    public ResultBean submitSalesOrderApprove(BaseDiscountpackageDto dto) {
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<BaseSalesDicountVo>> selectSalesOrderList(PagerQuery<BaseSalesDicountQuery> query) {
+    public ResultBean<PagerVo<BaseSalesDicountVo>> selectSalesOrderList(PagerQuery<BaseSalesDicountQuery> query) {
-		return null;
+        return null;
-	}
+    }
 
-	@Override
+    @Override
-	public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery query) {
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
-		return null;
+        return null;
-	}
+    }
 
 
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicle.java

@@ -71,6 +71,9 @@ public class BaseVehicle extends BaseEntity {
     @ApiModelProperty("创建组织(陕汽必须的字段)")
     private String createOrg;
 
+    @ApiModelProperty("创建组织名称(陕汽必须的字段)")
+    private String createOrgName;
+
     @ApiModelProperty("使用组织id")
     private String useOrg;
 
@@ -117,34 +120,10 @@ public class BaseVehicle extends BaseEntity {
     private String rebate3;
     @ApiModelProperty("结算状态 实销 1/买断 2")
     private String settlementStatus;
-//    @ApiModelProperty("特殊或差异说明")
+    @ApiModelProperty(value = "厂家采购订单类型key")
-//    private String specialInstructions;
+    private String manPurOrderTypeKey;
-    /*@ApiModelProperty("首次发车日期（陕汽必须的字段）")
+    @ApiModelProperty(value = "厂家采购订单类型value")
-    private Date firstStartDate;
+    private String manPurOrderTypeValue;
-
+    @ApiModelProperty("特殊或差异说明")
-    @ApiModelProperty(value = "验收人")
+    private String specialInstructions;
-    private String acceptPeople;
-
-    @ApiModelProperty(value = "出厂价")
-    private float exFactoryPrice;
-
-    @ApiModelProperty(value = "出库日期")
-    private Date deliveryDate;
-    @ApiModelProperty(value = "出库类型")
-    private String deliveryType;
-    @ApiModelProperty(value = "出库价")
-    private String deliveryPrice;
-    @ApiModelProperty(value = "销售合同编号")
-    private String salesContractNo;
-    @ApiModelProperty(value = "销售渠道")
-    private String salesType;
-
-    @ApiModelProperty(value = "财务开票价")
-    private float financialFare;
-    @ApiModelProperty(value = "补贴金额")
-    private float subsidies;
-    @ApiModelProperty(value = "是否占用")
-    private Integer isUse;
-    @ApiModelProperty(value = "具体其他配置")
-    private String otherRemarks;*/
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleDto.java

@@ -29,118 +29,60 @@ public class BaseVehicleDto implements Dto {
 
     @ApiModelProperty("物料sid（陕汽必须的字段）")
     private String materialSid;
-
     @ApiModelProperty("车型sid（陕汽必须的字段）")
     private String modelSid;
-
+    @ApiModelProperty("车辆状态key值")
+    private String vehicleState;
+    @ApiModelProperty("车辆状态value值")
+    private String vehicleStateValue;
+    @ApiModelProperty("车型名称")
+    private String modelName;
     @ApiModelProperty("车型配置sid")
     private String modelConfigSid;
-
+    @ApiModelProperty("特殊或差异说明")
+    private String specialInstructions;
     @ApiModelProperty("车架号(VIN)（陕汽必须的字段）")
     private String vinNo;
-
     @ApiModelProperty("发动机号/许可证号（陕汽必须的字段）")
     private String engineNo;
-
+    @ApiModelProperty(value = "厂家订单编号")
-    /*@ApiModelProperty("制造日期（陕汽必须的字段）")
-    private Date manufactureDate;*/
-
-    @ApiModelProperty("车辆状态key值")
-    private String vehicleState;
-
-    @ApiModelProperty("存放地点（陕汽必须的字段）")
-    private String location;
-
-    @ApiModelProperty("库龄（根据首次发车日期计算）（陕汽必须的字段）")
-    private String libraryAge;
-
-    @ApiModelProperty(value = "订车单号")
     private String orderingNo;
-
+    @ApiModelProperty(value = "厂家采购订单类型key")
-    @ApiModelProperty(value = "入库价")
+    private String manPurOrderTypeKey;
-    private float priced;
+    @ApiModelProperty(value = "厂家采购订单类型value")
-    @ApiModelProperty(value = "入库日期")
+    private String manPurOrderTypeValue;
+    @ApiModelProperty(value = "厂家入库日期")
     private Date priceDate;
-    @ApiModelProperty(value = "实销日期")
-    private Date solidDate;
-
-    @ApiModelProperty(value = "指导价")
-    private float guidedPrice;
-
-    @ApiModelProperty("创建组织(陕汽必须的字段)")
-    private String createOrg;
-
-    @ApiModelProperty("使用组织id")
-    private String useOrg;
-
-    @ApiModelProperty("车辆状态value值")
-    private String vehicleStateValue;
-
-    @ApiModelProperty("使用组织名称")
-    private String useOrgName;
-
-    @ApiModelProperty("车辆型号")
-    private String vehicleType;
-
-    @ApiModelProperty("车型名称")
-    private String modelName;
-
-    @ApiModelProperty("简述配置项sid")
-    private String configurationItemsSid;
-
     @ApiModelProperty("发车日期")
     private String departureDate;
-
     @ApiModelProperty("到货日期")
     private String arrivalDate;
-
     @ApiModelProperty("销售日期")
     private String salesDate;
-
+    @ApiModelProperty(value = "买断日期")
-    @ApiModelProperty("退库日期")
+    private Date solidDate;
+    @ApiModelProperty("结算状态（0：没买断，1预买断，2买断）")
+    private String settlementStatus;
+    @ApiModelProperty("采购退库日期")
     private String returnDate;
-
+    @ApiModelProperty("存放地点（陕汽必须的字段）")
-    @ApiModelProperty("返利1")
+    private String location;
-    private String rebate1;
+    @ApiModelProperty(value = "厂家入库价")
-
+    private float priced;
-    @ApiModelProperty("返利2")
+    @ApiModelProperty(value = "成交价")
-    private String rebate2;
+    private float guidedPrice;
-
     @ApiModelProperty("保修卡号")
     private String warrantyCardNo;
-
     @ApiModelProperty("锁定状态")
     private String lockedState;
-
     @ApiModelProperty("锁定状态Value")
     private String lockedStateValue;
-
+    @ApiModelProperty("创建组织sid(陕汽必须的字段)")
-    /*@ApiModelProperty("首次发车日期（陕汽必须的字段）")
+    private String createOrg;
-    private Date firstStartDate;
+    @ApiModelProperty("创建组织名称(陕汽必须的字段)")
-
+    private String createOrgName;
-    @ApiModelProperty(value = "验收人")
+    @ApiModelProperty("使用组织sid")
-    private String acceptPeople;
+    private String useOrg;
-
+    @ApiModelProperty("使用组织名称")
-    @ApiModelProperty(value = "出厂价")
+    private String useOrgName;
-    private float exFactoryPrice;
-
-    @ApiModelProperty(value = "出库日期")
-    private Date deliveryDate;
-    @ApiModelProperty(value = "出库类型")
-    private String deliveryType;
-    @ApiModelProperty(value = "出库价")
-    private String deliveryPrice;
-    @ApiModelProperty(value = "销售合同编号")
-    private String salesContractNo;
-    @ApiModelProperty(value = "销售渠道")
-    private String salesType;
-
-    @ApiModelProperty(value = "财务开票价")
-    private float financialFare;
-    @ApiModelProperty(value = "补贴金额")
-    private float subsidies;
-    @ApiModelProperty(value = "是否占用")
-    private Integer isUse;
-    @ApiModelProperty(value = "具体其他配置")
-    private String otherRemarks;*/
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleSelectVo.java

@@ -18,138 +18,62 @@ public class BaseVehicleSelectVo implements Vo {
     private static final long serialVersionUID = -3846821999540647483L;
     @ApiModelProperty(value = "车辆sid")
     private String sid;
-
+    @ApiModelProperty("物料sid（陕汽必须的字段）")
-    @ApiModelProperty(value = "车型名称")
+    private String materialSid;
+    @ApiModelProperty("车型sid（陕汽必须的字段）")
+    private String modelSid;
+    @ApiModelProperty("车辆状态key值")
+    private String vehicleState;
+    @ApiModelProperty("车辆状态value值")
+    private String vehicleStateValue;
+    @ApiModelProperty("车型名称")
     private String modelName;
-
+    @ApiModelProperty("车型配置sid")
-    @ApiModelProperty(value = "品牌名称")
+    private String modelConfigSid;
-    private String brandName;
+    @ApiModelProperty("特殊或差异说明")
-
+    private String specialInstructions;
     @ApiModelProperty("车架号(VIN)（陕汽必须的字段）")
     private String vinNo;
-
     @ApiModelProperty("发动机号/许可证号（陕汽必须的字段）")
     private String engineNo;
-
+    @ApiModelProperty(value = "厂家订单编号")
-    @ApiModelProperty("制造日期（陕汽必须的字段）")
+    private String orderingNo;
-    private Date manufactureDate;
+    @ApiModelProperty(value = "厂家采购订单类型key")
-
+    private String manPurOrderTypeKey;
+    @ApiModelProperty(value = "厂家采购订单类型value")
+    private String manPurOrderTypeValue;
+    @ApiModelProperty(value = "厂家入库日期")
+    private Date priceDate;
+    @ApiModelProperty("发车日期")
+    private String departureDate;
+    @ApiModelProperty("到货日期")
+    private String arrivalDate;
+    @ApiModelProperty("销售日期")
+    private String salesDate;
+    @ApiModelProperty(value = "买断日期")
+    private Date solidDate;
+    @ApiModelProperty("结算状态（0：没买断，1预买断，2买断）")
+    private String settlementStatus;
+    @ApiModelProperty("采购退库日期")
+    private String returnDate;
     @ApiModelProperty("存放地点（陕汽必须的字段）")
     private String location;
-
+    @ApiModelProperty(value = "厂家入库价")
-    @ApiModelProperty("车辆状态key值")
+    private float priced;
-    private String vehicleState;
+    @ApiModelProperty(value = "成交价")
-
+    private float guidedPrice;
-    @ApiModelProperty("车辆状态value值")
+    @ApiModelProperty("保修卡号")
-    private String vehicleStateValue;
+    private String warrantyCardNo;
-
+    @ApiModelProperty("锁定状态")
-    @ApiModelProperty("首次发车日期（陕汽必须的字段）")
+    private String lockedState;
-    private Date firstStartDate;
+    @ApiModelProperty("锁定状态Value")
-
+    private String lockedStateValue;
-    @ApiModelProperty(value = "库龄 （根据首次发车日期计算）")
+    @ApiModelProperty("创建组织sid(陕汽必须的字段)")
-    private String libraryAge;
+    private String createOrg;
-
+    @ApiModelProperty("创建组织名称(陕汽必须的字段)")
-    @ApiModelProperty("使用组织id")
+    private String createOrgName;
-    private String[][] useOrg;
+    @ApiModelProperty("使用组织sid")
-
+    private String useOrg;
-
     @ApiModelProperty("使用组织名称")
     private String useOrgName;
-
-    @ApiModelProperty("使用组织名称")
-    private List<String> vehiclePhoto;
-
-//    @ApiModelProperty(value = "内置编码")
-//    private String modelName;
-
-//    @ApiModelProperty(value = "验收人")
-//    private String acceptPeople;
-//
-//    @ApiModelProperty(value = "订车单号")
-//    private String orderingNo;
-//
-//    @ApiModelProperty(value = "出厂价")
-//    private float exFactoryPrice;
-//
-//    @ApiModelProperty(value = "入库价")
-//    private float priced;
-//
-//    @ApiModelProperty(value = "入库日期")
-//    private Date priceDate;
-//
-//    @ApiModelProperty(value = "实销日期")
-//    private Date solidDate;
-//
-//    @ApiModelProperty(value = "出库类型")
-//    private String deliveryType;
-//
-//    @ApiModelProperty(value = "出库价")
-//    private String deliveryPrice;
-//
-//    @ApiModelProperty(value = "销售合同编号")
-//    private String salesContractNo;
-//
-//    @ApiModelProperty(value = "销售渠道")
-//    private String salesType;
-//
-//    @ApiModelProperty(value = "指导价")
-//    private float guidedPrice;
-//
-//    @ApiModelProperty(value = "财务开票价")
-//    private float financialFare;
-//
-//    @ApiModelProperty(value = "补贴金额")
-//    private float subsidies;
-//
-//    @ApiModelProperty(value = "是否占用")
-//    private Integer isUse;
-//
-//    @ApiModelProperty(value = "具体其他配置")
-//    private String otherRemarks;
-//
-//    @ApiModelProperty(value = "出库日期")
-//    private Date deliveryDate;
-
-//    @ApiModelProperty("发车日期")
-//    private String departureDate;
-//    @ApiModelProperty("物料sid（陕汽必须的字段）")
-//    private String materialSid;
-//
-//    @ApiModelProperty("车型sid（陕汽必须的字段）")
-//    private String modelSid;
-//
-//    @ApiModelProperty("车型配置sid")
-//    private String modelConfigSid;
-//
-//    @ApiModelProperty("创建组织(陕汽必须的字段)")
-//    private String createOrg;
-//
-//    @ApiModelProperty("车辆型号")
-//    private String vehicleType;
-//
-//    @ApiModelProperty("简述配置项sid")
-//    private String configurationItemsSid;
-//
-//    @ApiModelProperty("到货日期")
-//    private String arrivalDate;
-//
-//    @ApiModelProperty("销售日期")
-//    private String salesDate;
-//
-//    @ApiModelProperty("退库日期")
-//    private String returnDate;
-//
-//    @ApiModelProperty("返利1")
-//    private String rebate1;
-//
-//    @ApiModelProperty("返利2")
-//    private String rebate2;
-//
-//    @ApiModelProperty("保修卡号")
-//    private String warrantyCardNo;
-//
-//    @ApiModelProperty("锁定状态")
-//    private String lockedState;
-
-
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehiclemodel/BaseVehicleModelDto.java

@@ -61,9 +61,8 @@ public class BaseVehicleModelDto implements Dto {
     @NotBlank(message = "车型编码不能为空")
     private String vehicleTypeCode;
 
-  /*  @ApiModelProperty(value = "车型名称（产品名称）(陕汽必须的字段)", required = true)
+    @ApiModelProperty(value = "车型名称（产品名称）(陕汽必须的字段)")
-    @NotBlank(message = "车型名称不能为空")
+    private String modelName;
-    private String modelName;*/
 
     @ApiModelProperty(value = "产品线(陕汽必须的字段)", required = true)
     @NotBlank(message = "产品线不能为空")
@@ -158,6 +157,9 @@ public class BaseVehicleModelDto implements Dto {
     @ApiModelProperty("是否可以删除（1是，0否）")
     private Integer isDel;
 
+    @ApiModelProperty(value = "车型别名")
+    private String vehicleAlias;
+
     @ApiModelProperty("车型附件")
     private List<BaseVehicleModelAppendixDto> baseVehicleModelAppendixDtos;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java

@@ -64,7 +64,7 @@ public interface BaseVehmodelConfigFeign {
 
     @ApiOperation("车型与常用配置建立关联关系")
     @PostMapping("/save")
-    public ResultBean save(@RequestBody BaseVehmodelConfigDto dto);
+    public ResultBean save(@RequestBody List<BaseVehmodelConfigDto> dto);
 
     @ApiOperation("修改保存")
     @PostMapping("/update")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java

@@ -57,7 +57,7 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
     }
 
     @Override
-    public ResultBean save(BaseVehmodelConfigDto dto) {
+    public ResultBean save(List<BaseVehmodelConfigDto> dto) {
         return ResultBean.fireFail().setMsg("接口anrui-base/basevehmodelconfig/save无法访问");
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java

@@ -125,8 +125,8 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
     }
 
     @Override
-    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery query) {
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
-        return baseDiscountpackageService.getAppPackage(query);
+        return baseDiscountpackageService.getAppPackage(userSid);
     }
 
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java

@@ -4,7 +4,6 @@ import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basediscountpackage.*;
-import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
 import com.yxt.anrui.base.biz.flow.FlowableService;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
@@ -313,13 +312,13 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         return qw;
     }
 
-    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(AppBaseDiscountpackageQuery query) {
+    public ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(String userSid) {
         ResultBean<List<AppBaseDiscountpackageVo>> rb = ResultBean.fireFail();
         QueryWrapper<BaseDiscountpackage> qw = new QueryWrapper<>();
-        if (query != null) {
+        if (StringUtils.isNotBlank(userSid)) {
             //根据申请人sid查询分公司sid
             String orgSid = "";
-            ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid());
+            ResultBean<String> stringResultBean = sysStaffOrgFeign.getPathSidByUserSid(userSid);
             if (stringResultBean.getSuccess()) {
                 orgSid = stringResultBean.getData();
             }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml

@@ -12,12 +12,12 @@
     <!--分页列表-->
     <select id="pagerList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleVo">
         SELECT bv.sid,
-               bv.modelName,
+        bv.modelName,
-               bv.vinNo,
+        bv.vinNo,
-               bv.engineNo,
+        bv.engineNo,
-               bv.vehicleStateValue,
+        bv.vehicleStateValue,
-               bv.location,
+        bv.location,
-               bv.libraryAge
+        bv.libraryAge
         FROM base_vehicle bv
         <where>
             ${ew.sqlSegment}
@@ -32,21 +32,8 @@
     </select>
     <!--详情及修改回显-->
     <select id="details" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo">
-        SELECT bv.sid,
+        SELECT bv.*
-               bv.modelName,
-               bvm.brandName,
-               bv.vinNo,
-               bv.engineNo,
-               -- bv.manufactureDate,
-               bv.location,
-               bv.vehicleState,
-               bv.vehicleStateValue,
-               -- bv.firstStartDate,
-               bv.libraryAge,
-               bv.useOrg,
-               bv.useOrgName
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
         WHERE bv.sid = #{sid}
     </select>
     <!--导出车辆管理列表-->
@@ -69,10 +56,10 @@
         <!--库龄（根据首次发车日期计算）-->
         bv.libraryAge
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
+        LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
-                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+        LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-                 LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
+        LEFT JOIN anrui_portal.dict_common dc ON dc.dictKey = bv.vehicleState
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
     <!--删除或批量删除车辆信息-->
     <delete id="deleteBySids" parameterType="java.util.List">
@@ -158,16 +145,16 @@
         bvm.isValidity,
         bvm.isValidityValue
         FROM base_vehicle_model bvm
-                 LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
+        LEFT JOIN base_model_config bmc ON bmc.vehicleSid = bvm.sid
-                 LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
+        LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
-                 LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+        LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
         WHERE bvm.sid = #{modelSid}
-          AND bmc.sid = #{modelConfigSid}
+        AND bmc.sid = #{modelConfigSid}
     </select>
     <!--导入车辆信息-->
     <insert id="saveList">
         INSERT INTO base_vehicle(sid, modelSid, modelConfigSid, vinNo, engineNo, manufactureDate, location,
-                                 vehicleState, firstStartDate, libraryAge)
+        vehicleState, firstStartDate, libraryAge)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (UUID(),<!--sid-->
@@ -192,12 +179,12 @@
     <select id="namesDown" resultType="java.util.Map">
         SELECT bv.vinNo, bv.sid
         FROM base_vehicle bv
-            ${ew.customSqlSegment}
+                ${ew.customSqlSegment}
     </select>
     <select id="selBySid" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicle">
         select bv.sid,
-               bv.modelSid,
+        bv.modelSid,
-               bv.modelConfigSid,
+        bv.modelConfigSid,
         <!--车架号(VIN)-->
         bv.vinNo,
         <!--发动机号/许可证号-->
@@ -256,13 +243,13 @@
     <select id="getAppCurrentCarByPageList"
             resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarModelByPageListVo">
         SELECT bvm.sid AS modelSid,
-               bvm.vehicleAlias,
+        bvm.vehicleAlias,
-               bvm.brandName,
+        bvm.brandName,
-               bvm.vehicleVersionValue,
+        bvm.vehicleVersionValue,
-               bvm.fuelTypeValue,
+        bvm.fuelTypeValue,
-               bvm.gearboxTypeValue
+        bvm.gearboxTypeValue
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+        LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -289,8 +276,8 @@
                bvm.insideCode,
                bmc.packingCase
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
+                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.sid
         WHERE bv.modelSid = #{modelSid}
         GROUP BY bvm.sid
     </select>
@@ -307,8 +294,8 @@
             resultType="com.yxt.anrui.base.api.basevehicle.AppCurrentCarDetailVo">
         SELECT bv.guidedPrice AS price
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
+                     LEFT JOIN base_vehicle_model bvm ON bvm.sid = bv.modelSid
-                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+                     LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
         WHERE bvm.sid = #{modelSid}
         ORDER BY bv.guidedPrice ASC
     </select>
@@ -316,14 +303,14 @@
     <select id="getModelNumByModelSid" resultType="java.lang.String">
         SELECT count(*)
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
         WHERE bvm.sid = #{modelSid}
     </select>
 
     <select id="getConfigNumByModelSid" resultType="java.lang.String">
         SELECT count(*)
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
     </select>
 
@@ -345,8 +332,8 @@
                bmc.packingCase,
                bvm.insideCode
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -373,9 +360,9 @@
         <!--配置Sid-->
         bv.modelConfigSid AS configSid
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <select id="selectExiCarConfig" resultType="com.yxt.anrui.base.api.basevehicle.ExiCarConfigDetailVo">
@@ -415,8 +402,8 @@
                bmc.configuringBao,
                bmc.otherConfig
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -438,8 +425,8 @@
         <!--销售指导价-->
         bv.guidedPrice
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
         WHERE bv.sid = #{sid}
     </select>
 
@@ -473,42 +460,42 @@
         <!--配置Sid-->
         bv.modelConfigSid AS configSid
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
         ORDER BY
-            bv.priceDate desc
+        bv.priceDate desc
     </select>
 
     <select id="getModelList" resultType="com.yxt.anrui.base.api.basevehicle.AppVehicleModelPriceVo">
-        SELECT DISTINCT bvm.sid                              AS modelSid,
+        SELECT DISTINCT bvm.sid AS modelSid,
-                        bvm.vehicleAlias                     AS modelName,
+        bvm.vehicleAlias AS modelName,
-                        bvm.carBrand                         AS brandSid,
+        bvm.carBrand AS brandSid,
-                        bvm.brandName,
+        bvm.brandName,
-                        bvm.vehicleVersionValue              AS versionValue,
+        bvm.vehicleVersionValue AS versionValue,
-                        bvm.fuelTypeValue,
+        bvm.fuelTypeValue,
-                        bvm.gearboxTypeValue,
+        bvm.gearboxTypeValue,
-                        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
+        (SELECT CONCAT(MIN(bvc.guidedPrice), '-', MAX(bvc.guidedPrice))
-                         FROM base_vehmodel_config bvc
+        FROM base_vehmodel_config bvc
-                         WHERE bvc.modelSid
+        WHERE bvc.modelSid
-                             = bvm.sid
+        = bvm.sid
-                           AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
+        AND bvc.useOrgSid = #{useOrgSid}) AS guidedPrice,
-                        (SELECT count(*)
+        (SELECT count(*)
-                         FROM base_vehmodel_config bvc
+        FROM base_vehmodel_config bvc
-                         WHERE bvc.modelSid = bvm.sid
+        WHERE bvc.modelSid = bvm.sid
-                           AND bvc.useOrgSid = #{useOrgSid}) AS
+        AND bvc.useOrgSid = #{useOrgSid}) AS
-                                                                configNum,
+        configNum,
-                        (SELECT count(*)
+        (SELECT count(*)
-                         FROM base_vehicle bv
+        FROM base_vehicle bv
-                         WHERE bv.modelSid = bvm.sid
+        WHERE bv.modelSid = bvm.sid
-                           AND lockedState = '03'
+        AND lockedState = '03'
-                           AND bv.useOrg =
+        AND bv.useOrg =
-                               #{useOrgSid})                 AS nowCarNum,
+        #{useOrgSid}) AS nowCarNum,
-                        (SELECT SUM(cast(bvad.quantity as signed)) as quantity
+        (SELECT SUM(cast(bvad.quantity as signed)) as quantity
-                         FROM bus_vehicle_apply_detail bvad
+        FROM bus_vehicle_apply_detail bvad
-                         WHERE bvad.vehicleSid = bvm.sid)    AS produceCarNum
+        WHERE bvad.vehicleSid = bvm.sid) AS produceCarNum
         FROM base_vehicle_model bvm
-                 LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
+        LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -521,7 +508,7 @@
                 FROM bus_vehicle_apply_detail bvad
                 WHERE bvad.vehicleSid = bvm.sid)                                                           AS produceCarNum
         FROM base_vehicle_model bvm
-                 LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
+                     LEFT JOIN base_vehmodel_config bvc ON bvm.sid = bvc.modelSid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.useOrgSid != #{useOrg}
     </select>
@@ -539,15 +526,15 @@
                         WHERE bv.modelSid = bvm.sid
                           AND bv.modelConfigSid = bvc.configurationItemsSid
                           AND lockedState = '03')
-                       +
+                               +
                        (SELECT count(*)
                         FROM bus_vehicle_apply_detail bvad
                         WHERE bvad.vehicleSid = bvm.sid
                           AND bvad.configSid = bvc.configurationItemsSid)
-                   )             AS num
+                       )         AS num
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -574,8 +561,8 @@
                          WHERE bv.modelSid = bvm.sid
                            AND lockedState = '03')           AS nowCarNum
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
+                     LEFT JOIN base_vehicle_model bvm ON bv.modelSid = bvm.sid
-            ${ew.customSqlSegment}
+                ${ew.customSqlSegment}
     </select>
 
     <select id="vehicleReturnPageList" resultType="com.yxt.anrui.base.api.basevehicle.BaseVehicleReturnVo">
@@ -595,9 +582,9 @@
         bmc.configName,
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
 
     <update id="updateByVinNo">
@@ -652,9 +639,9 @@
         DATE_FORMAT(bv.priceDate, '%Y-%m-%d') as priceDate,
         bv.priced
         FROM base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
-            ${ew.customSqlSegment}
+        ${ew.customSqlSegment}
     </select>
     <!--根据车架号查询现车详情-->
     <select id="getPurchaseDetails" resultType="com.yxt.anrui.base.api.basevehicle.AppPurchaseDetailsVo">
@@ -669,11 +656,11 @@
     </select>
 
     <select id="selectVo" resultType="com.yxt.anrui.base.api.basevehicle.PcBaseVehicleOrderVo">
-        select bv.vinNo    linkNo,
+        select bv.vinNo linkNo,
-               bv.location linkText,
+        bv.location linkText,
-               bv.sid      linkSid,
+        bv.sid linkSid,
-               if(bv.lockedState = 1, 1, 0)
+        if(bv.lockedState = 1, 1, 0)
-                   as      isFictitious
+        as isFictitious
         from base_vehicle bv
         <where>
             ${ew.sqlSegment}
@@ -692,14 +679,14 @@
                carColor          AS color,
                location          AS address
         FROM base_vehicle bv
-                 LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
+                     LEFT JOIN base_model_config bmc ON bmc.sid = bv.modelConfigSid
-            ${ew.customSqlSegment}
+                ${ew.customSqlSegment}
     </select>
 
     <select id="selectVehicleCount" resultType="java.lang.Integer">
         select count(*)
         from base_vehicle bv
-            ${ew.customSqlSegment}
+                ${ew.customSqlSegment}
     </select>
 
     <select id="selectByModelSidAndConfigSid"
@@ -708,8 +695,8 @@
                bv.guidedPrice   AS price,
                bmc.configName   AS commonlyConfig
         from base_vehicle bv
-                 LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+                     LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+                     LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
         where bv.modelSid = #{modelSid}
           AND bv.modelConfigSid = #{configSid}
           AND bv.useOrg = #{useOrg}
@@ -721,22 +708,22 @@
                bvc.guidedPrice  AS price,
                bmc.configName   AS commonlyConfig
         from base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         where bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
     </select>
     <select id="getModelOrderCarList" resultType="com.yxt.anrui.base.api.basevehicle.AppBaseNowProduceCarVo">
-        SELECT bvo.orderNo          AS orderId,
+        SELECT bvo.orderNo AS orderId,
-               bvo.orderStatus      AS state,
+        bvo.orderStatus AS state,
-               bvo.orderDate        AS `date`,
+        bvo.orderDate AS `date`,
-               bvo.expectLaunchDate AS forecastDate,
+        bvo.expectLaunchDate AS forecastDate,
-               bvo.launchDate       AS `upDate`,
+        bvo.launchDate AS `upDate`,
-               bvo.offlineDate      AS downDate,
+        bvo.offlineDate AS downDate,
-               bvad.quantity        as `number`
+        bvad.quantity as `number`
         FROM bus_vehicle_order bvo
-                 left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
+        left join bus_vehicle_apply_detail bvad on bvo.purchaseApplyMediumModelSid = bvad.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -746,8 +733,8 @@
         select bv.vinNo    vin,
                bv.location address,
                bv.sid      carSid,
-        if(bv.lockedState = 1, 1, 0)
+               if(bv.lockedState = 1, 1, 0)
-                   as      isFictitious
+                       as  isFictitious
         from base_vehicle bv
         where bv.modelSid = #{modelSid}
           and bv.modelConfigSid = #{configSid}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java

@@ -135,33 +135,7 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
      * @return
      */
     public BaseVehicleSelectVo details(String sid) {
-        BaseVehicle baseVehicle = fetchBySid(sid);
         BaseVehicleSelectVo baseVehicleSelectVo = baseMapper.details(sid);
-        String vehicleSid = baseVehicleSelectVo.getSid();
-        List<String> filePathList = new ArrayList<>();
-        List<String> stringList = baseVehicleAppendixService.selectList(vehicleSid);
-        if (stringList.size() != 0) {
-            for (int i = 0; i < stringList.size(); i++) {
-                String filePath = fileUploadComponent.getUrlPrefix() + stringList.get(i);
-                filePathList.add(filePath);
-            }
-        }
-        baseVehicleSelectVo.setVehiclePhoto(filePathList);
-        if (StringUtils.isNotBlank(baseVehicle.getUseOrg())) {//使用组织sid
-            //将string类型转换为List类型
-            List<String> list = Arrays.asList(baseVehicle.getUseOrg().split(","));
-            String[][] s = new String[list.size()][];
-            for (int i = 0; i < list.size(); i++) {
-                String[] list1 = {};
-                //根据使用组织查询上级
-                ResultBean<SysOrganization> resultBean = sysOrganizationFeign.selectBySid(list.get(i));
-                if (resultBean.getSuccess()) {
-                    list1 = resultBean.getData().getOrgSidPath().replace("/", ",").split(",");
-                }
-                s[i] = list1;
-            }
-            baseVehicleSelectVo.setUseOrg(s);
-        }
         return baseVehicleSelectVo;
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java

@@ -198,6 +198,7 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
         if (StringUtils.isNotBlank(name)) {
             qw.like("bvb.brandName", name);
         }
+        qw.eq("bvb.isDelete",0);
         return baseMapper.namesDown(qw);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelMapper.xml

@@ -297,8 +297,10 @@
     </select>
 
     <select id="selectDownPlusByModelName" resultType="java.util.Map">
-        select bvm.modelName, bvm.sid
+        SELECT bvm.modelName, bvm.sid, bvc.`configurationItemsSid`
-        from base_vehicle_model bvm
+        FROM base_vehicle_model bvm
+                     LEFT JOIN base_vehmodel_config bvc
+                ON bvm.`sid` = bvc.`modelSid`
                 ${ew.customSqlSegment}
     </select>
 
@@ -393,10 +395,10 @@
     <select id="listPageByVehmodel" resultType="com.yxt.anrui.base.api.basevehiclemodel.VehModelVo">
         SELECT bvm.`brandName`,bvm.`modelName`,bmc.`configName`,bmc.otherConfig,bvc.guidedPrice
         FROM base_vehmodel_config bvc
-                     LEFT JOIN base_vehicle_model bvm
+        LEFT JOIN base_vehicle_model bvm
-                ON bvc.`modelSid` = bvm.`sid`
+        ON bvc.`modelSid` = bvm.`sid`
-                     LEFT JOIN base_model_config bmc
+        LEFT JOIN base_model_config bmc
-                ON bvc.`configurationItemsSid` = bmc.`sid`
+        ON bvc.`configurationItemsSid` = bmc.`sid`
         <where>
             ${ew.sqlSegment}
         </where>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclemodel/BaseVehicleModelService.java

@@ -530,6 +530,8 @@ public class BaseVehicleModelService extends MybatisBaseService<BaseVehicleModel
         if (baseVehicleModel == null) {
             return rb.setMsg("该车型信息不存在");
         }
+        dto.setModelName(dto.getVehicleTypeValue()+dto.getDriveFormValue()+dto.getGearboxTypeValue()+dto.getVehicleVersionValue()+dto.getProductLineValue()+dto.getPowerValue()+dto.getFuelTypeValue());
+        dto.setVehicleAlias(dto.getProductLineValue() + " " + dto.getDriveFormValue() + " " + dto.getVehicleTypeValue() + " " + dto.getPowerValue());
         int i = updateBySid(dto.toMap(), sid);
         baseVehicleModelAppendixService.deleteByVehModelSid(sid);
         List<BaseVehicleModelAppendixDto> baseVehicleModelAppendixDtos = dto.getBaseVehicleModelAppendixDtos();

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java

@@ -73,7 +73,7 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
     @Override
     @ApiOperation("车型与常用配置建立关联关系")
     @PostMapping("/save")
-    public ResultBean save(@RequestBody BaseVehmodelConfigDto dto) {
+    public ResultBean save(@RequestBody List<BaseVehmodelConfigDto> dto) {
         return baseVehmodelConfigService.checkSave(dto);
     }
 

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java

@@ -404,25 +404,29 @@ public class BaseVehmodelConfigService extends MybatisBaseService<BaseVehmodelCo
         return vo;
     }
 
-    public ResultBean checkSave(BaseVehmodelConfigDto dto) {
+    public ResultBean checkSave(List<BaseVehmodelConfigDto> dto) {
         ResultBean rb = ResultBean.fireFail();
-        String modelSid = dto.getModelSid();
+        for (BaseVehmodelConfigDto baseVehmodelConfigDto : dto) {
-        String configurationItemsSid = dto.getConfigurationItemsSid();
+            String modelSid = baseVehmodelConfigDto.getModelSid();
-        BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
+            String configurationItemsSid = baseVehmodelConfigDto.getConfigurationItemsSid();
-        if (vo != null) {
+            BaseVehmodelConfigVo vo = baseMapper.checkSave(modelSid, configurationItemsSid);
-            return rb.setMsg("当前常用配置信息已关联当前车型，请重新选择");
+            if (vo != null) {
-        }
+                return rb.setMsg("当前常用配置信息已关联当前车型，请重新选择");
-        BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
+            }
-        String sid = baseVehmodelConfig.getSid();
+            BaseVehmodelConfig baseVehmodelConfig = new BaseVehmodelConfig();
-        BeanUtil.copyProperties(dto, baseVehmodelConfig);
+            String sid = baseVehmodelConfig.getSid();
-        baseVehmodelConfig.setSid(sid);
+            BeanUtil.copyProperties(dto, baseVehmodelConfig);
-        String orgSid = "";
+            baseVehmodelConfig.setSid(sid);
-        ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(dto.getStaffSid());
+            String orgSid = "";
-        if (stringResultBean.getSuccess()) {
+            ResultBean<String> stringResultBean = sysStaffOrgFeign.selectSidPathByStaffSid(baseVehmodelConfigDto.getStaffSid());
-            orgSid = stringResultBean.getData();
+            if (stringResultBean.getSuccess()) {
-        }
+                orgSid = stringResultBean.getData();
-        baseVehmodelConfig.setUseOrgSid(orgSid);
+            }
-        save(baseVehmodelConfig);
+            baseVehmodelConfig.setUseOrgSid(orgSid);
+            baseVehmodelConfig.setModelSid(modelSid);
+            baseVehmodelConfig.setConfigurationItemsSid(configurationItemsSid);
+            save(baseVehmodelConfig);
+        }
         return rb.success().setMsg("关联成功");
     }
 

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdepositfictitious/BusDepositFictitiousFeign.java

@@ -55,24 +55,5 @@ import java.util.List;
         path = "v1/busdepositfictitious",
         fallback = BusDepositFictitiousFeignFallback.class)
 public interface BusDepositFictitiousFeign {
-
+    
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<BusDepositFictitiousVo>> listPage(@RequestBody PagerQuery<BusDepositFictitiousQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusDepositFictitiousDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<BusDepositFictitiousDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeign.java

@@ -26,14 +26,7 @@
 package com.yxt.anrui.buscenter.api.bussalesorderdeposit;
 
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -56,23 +49,5 @@ import java.util.List;
         fallback = BusSalesOrderDepositFeignFallback.class)
 public interface BusSalesOrderDepositFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+   
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<BusSalesOrderDepositVo>> listPage(@RequestBody PagerQuery<BusSalesOrderDepositQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusSalesOrderDepositDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<BusSalesOrderDepositDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositFeignFallback.java

@@ -48,25 +48,4 @@ import java.util.List;
 @Component
 public class BusSalesOrderDepositFeignFallback implements BusSalesOrderDepositFeign {
 
-	@Override
-	public ResultBean<PagerVo<BusSalesOrderDepositVo>> listPage(PagerQuery<BusSalesOrderDepositQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorderdeposit/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(BusSalesOrderDepositDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderdeposit/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderdeposit/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<BusSalesOrderDepositDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorderdeposit/fetchDetailsBySid无法访问");
-	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeign.java

@@ -56,23 +56,5 @@ import java.util.List;
         fallback = BusSalesOrderDiscountFeignFallback.class)
 public interface BusSalesOrderDiscountFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<BusSalesOrderDiscountVo>> listPage(@RequestBody PagerQuery<BusSalesOrderDiscountQuery> pq);
 
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusSalesOrderDiscountDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<BusSalesOrderDiscountDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdiscount/BusSalesOrderDiscountFeignFallback.java

@@ -48,25 +48,4 @@ import java.util.List;
 @Component
 public class BusSalesOrderDiscountFeignFallback implements BusSalesOrderDiscountFeign {
 
-	@Override
-	public ResultBean<PagerVo<BusSalesOrderDiscountVo>> listPage(PagerQuery<BusSalesOrderDiscountQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorderdiscount/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(BusSalesOrderDiscountDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderdiscount/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderdiscount/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<BusSalesOrderDiscountDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorderdiscount/fetchDetailsBySid无法访问");
-	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeign.java

@@ -56,23 +56,5 @@ import java.util.List;
         fallback = BusSalesOrderInsuranceFeignFallback.class)
 public interface BusSalesOrderInsuranceFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<BusSalesOrderInsuranceVo>> listPage(@RequestBody PagerQuery<BusSalesOrderInsuranceQuery> pq);
 
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusSalesOrderInsuranceDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<BusSalesOrderInsuranceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderinsurance/BusSalesOrderInsuranceFeignFallback.java

@@ -47,26 +47,5 @@ import java.util.List;
  */
 @Component
 public class BusSalesOrderInsuranceFeignFallback implements BusSalesOrderInsuranceFeign {
-
+	
-	@Override
-	public ResultBean<PagerVo<BusSalesOrderInsuranceVo>> listPage(PagerQuery<BusSalesOrderInsuranceQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorderinsurance/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(BusSalesOrderInsuranceDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderinsurance/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderinsurance/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<BusSalesOrderInsuranceDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorderinsurance/fetchDetailsBySid无法访问");
-	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeign.java

@@ -55,24 +55,5 @@ import java.util.List;
         path = "v1/bussalesordermakeup",
         fallback = BusSalesOrderMakeupFeignFallback.class)
 public interface BusSalesOrderMakeupFeign {
-
+    
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<BusSalesOrderMakeupVo>> listPage(@RequestBody PagerQuery<BusSalesOrderMakeupQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusSalesOrderMakeupDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<BusSalesOrderMakeupDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermakeup/BusSalesOrderMakeupFeignFallback.java

@@ -47,26 +47,5 @@ import java.util.List;
  */
 @Component
 public class BusSalesOrderMakeupFeignFallback implements BusSalesOrderMakeupFeign {
-
+	
-	@Override
-	public ResultBean<PagerVo<BusSalesOrderMakeupVo>> listPage(PagerQuery<BusSalesOrderMakeupQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesordermakeup/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(BusSalesOrderMakeupDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordermakeup/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordermakeup/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<BusSalesOrderMakeupDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesordermakeup/fetchDetailsBySid无法访问");
-	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeign.java

@@ -25,13 +25,13 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesordermodel;
 
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelDto;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -54,18 +54,9 @@ import org.springframework.web.bind.annotation.*;
         fallback = BusSalesOrderModelFeignFallback.class)
 public interface BusSalesOrderModelFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+    @ApiOperation("保存")
-    @PostMapping("/listPage")
+    @PostMapping("/saveOrUpdate")
-    @ResponseBody
+    ResultBean save(@RequestBody AppBusSalesOrderModelDto dto);
-    public ResultBean<PagerVo<BusSalesOrderModelVo>> listPage(@RequestBody PagerQuery<BusSalesOrderModelQuery> pq);
 
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusSalesOrderModelDto dto);
 
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelFeignFallback.java

@@ -25,6 +25,7 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesordermodel;
 
+import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelDto;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -46,19 +47,8 @@ import org.springframework.stereotype.Component;
 @Component
 public class BusSalesOrderModelFeignFallback implements BusSalesOrderModelFeign {
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<BusSalesOrderModelVo>> listPage(PagerQuery<BusSalesOrderModelQuery> pq){
+    public ResultBean save(AppBusSalesOrderModelDto dto) {
-		ResultBean rb = ResultBean.fireFail();
+        return null;
-		return rb.setMsg("接口anrui-buscenter/bussalesordermodel/listPage无法访问");
+    }
-	}
-
-	@Override
-	public ResultBean save(BusSalesOrderModelDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordermodel/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordermodel/delBySids无法访问");
-	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/app/AppBusSalesOrderModelDto.java

@@ -0,0 +1,33 @@
+package com.yxt.anrui.buscenter.api.bussalesordermodel.app;
+
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppCarInfo;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfo;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/30 16:26
+ * @Description
+ */
+@Data
+public class AppBusSalesOrderModelDto implements Dto {
+    private static final long serialVersionUID = -1189347148270757235L;
+
+    @ApiModelProperty("选择的车型信息的数据")
+    private AppOrderInfo orderInfo;
+
+    @ApiModelProperty("根据车型查询出来的现车和采购订单数据")
+    private AppCarInfo carInfo;
+
+    @ApiModelProperty("订单sid")
+    private String saleOrderSid;
+
+    @ApiModelProperty("选择类型")
+    private String state;
+
+    @ApiModelProperty("排产数量")
+    private String arrangeNumber;
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeign.java

@@ -25,15 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.api.bussalesorderprice;
 
+import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
-
+import org.springframework.web.bind.annotation.RequestParam;
-import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -56,26 +53,6 @@ import java.util.List;
         fallback = BusSalesOrderPriceFeignFallback.class)
 public interface BusSalesOrderPriceFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<BusSalesOrderPriceVo>> listPage(@RequestBody PagerQuery<BusSalesOrderPriceQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusSalesOrderPriceDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<BusSalesOrderPriceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
-
     @ApiOperation("根据订单sid查询单台成交价")
     @GetMapping("/getPriceByOrderSid")
     ResultBean<String> getPriceByOrderSid(@RequestParam(value = "busSid") String busSid);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceFeignFallback.java

@@ -48,30 +48,8 @@ import java.util.List;
 @Component
 public class BusSalesOrderPriceFeignFallback implements BusSalesOrderPriceFeign {
 
-	@Override
+    @Override
-	public ResultBean<PagerVo<BusSalesOrderPriceVo>> listPage(PagerQuery<BusSalesOrderPriceQuery> pq){
+    public ResultBean<String> getPriceByOrderSid(String busSid) {
-		ResultBean rb = ResultBean.fireFail();
+        return null;
-		return rb.setMsg("接口anrui-buscenter/bussalesorderprice/listPage无法访问");
+    }
-	}
-
-	@Override
-	public ResultBean save(BusSalesOrderPriceDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderprice/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesorderprice/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<BusSalesOrderPriceDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesorderprice/fetchDetailsBySid无法访问");
-	}
-
-	@Override
-	public ResultBean<String> getPriceByOrderSid(String busSid) {
-		return null;
-	}
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeign.java

@@ -54,23 +54,5 @@ import org.springframework.web.bind.annotation.*;
         fallback = BusSalesOrderVehicleFeignFallback.class)
 public interface BusSalesOrderVehicleFeign {
 
-    @ApiOperation("根据条件分页查询数据的列表")
+   
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<BusSalesOrderVehicleVo>> listPage(@RequestBody PagerQuery<BusSalesOrderVehicleQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusSalesOrderVehicleDto dto);
-
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<BusSalesOrderVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordervehicle/BusSalesOrderVehicleFeignFallback.java

@@ -45,26 +45,5 @@ import org.springframework.stereotype.Component;
  */
 @Component
 public class BusSalesOrderVehicleFeignFallback implements BusSalesOrderVehicleFeign {
-
+    
-    @Override
-    public ResultBean<PagerVo<BusSalesOrderVehicleVo>> listPage(PagerQuery<BusSalesOrderVehicleQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
-        return rb.setMsg("接口anrui-buscenter/bussalesordervehicle/listPage无法访问");
-    }
-
-    @Override
-    public ResultBean save(BusSalesOrderVehicleDto dto) {
-        return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordervehicle/save无法访问");
-    }
-
-    @Override
-    public ResultBean delBySids(String[] sids) {
-        return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesordervehicle/delBySids无法访问");
-    }
-
-    @Override
-    public ResultBean<BusSalesOrderVehicleDetailsVo> fetchDetailsBySid(String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        return rb.setMsg("接口anrui-buscenter/bussalesordervehicle/fetchDetailsBySid无法访问");
-    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderFeign.java

@@ -55,24 +55,5 @@ import java.util.List;
         path = "v1/bussalesvehicleorder",
         fallback = BusSalesVehicleOrderFeignFallback.class)
 public interface BusSalesVehicleOrderFeign {
-
+    
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    @ResponseBody
-    public ResultBean<PagerVo<BusSalesVehicleOrderVo>> listPage(@RequestBody PagerQuery<BusSalesVehicleOrderQuery> pq);
-
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    @ResponseBody
-    public ResultBean save(@RequestBody BusSalesVehicleOrderDto dto);
-        
-    @ApiOperation("根据sid删除记录")
-    @DeleteMapping("/delBySids")
-    @ResponseBody
-    public ResultBean delBySids(@RequestBody String[] sids);
-      
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    @ResponseBody
-    public ResultBean<BusSalesVehicleOrderDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesvehicleorder/BusSalesVehicleOrderFeignFallback.java

@@ -47,26 +47,5 @@ import java.util.List;
  */
 @Component
 public class BusSalesVehicleOrderFeignFallback implements BusSalesVehicleOrderFeign {
-
+	
-	@Override
-	public ResultBean<PagerVo<BusSalesVehicleOrderVo>> listPage(PagerQuery<BusSalesVehicleOrderQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesvehicleorder/listPage无法访问");
-	}
-
-	@Override
-	public ResultBean save(BusSalesVehicleOrderDto dto){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesvehicleorder/save无法访问");
-	}
-
-	@Override
-	public ResultBean delBySids( String[] sids){
-		return ResultBean.fireFail().setMsg("接口anrui-buscenter/bussalesvehicleorder/delBySids无法访问");
-	}
-
-	@Override
-	public ResultBean<BusSalesVehicleOrderDetailsVo> fetchDetailsBySid(String sid){
-		ResultBean rb = ResultBean.fireFail();
-		return rb.setMsg("接口anrui-buscenter/bussalesvehicleorder/fetchDetailsBySid无法访问");
-	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.java

@@ -53,16 +53,7 @@ import java.util.List;
  */
 @Mapper
 public interface BusDepositFictitiousMapper extends BaseMapper<BusDepositFictitious> {
-
+    
-    //@Update("update bus_deposit_fictitious set name=#{msg} where id=#{id}")
-    //IPage<BusDepositFictitiousVo> voPage(IPage<BusDepositFictitious> page, @Param(Constants.WRAPPER) QueryWrapper<BusDepositFictitious> qw);
-
-    IPage<BusDepositFictitiousVo> selectPageVo(IPage<BusDepositFictitious> page, @Param(Constants.WRAPPER) Wrapper<BusDepositFictitious> qw);
-
-    List<BusDepositFictitiousVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusDepositFictitious> qw);
-
-    @Select("select * from bus_deposit_fictitious")
-    List<BusDepositFictitiousVo> selectListVo();
 
     /**
      * 根据订金sid删除虚拟订单和订金关联的信息

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml

@@ -3,21 +3,6 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo">
-        SELECT *
-        FROM bus_deposit_fictitious
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousVo">
-        SELECT *
-        FROM bus_deposit_fictitious
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
     <!--根据订金sid删除虚拟订单和订金关联信息-->
     <delete id="deleteByDepositSid">
         delete

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousRest.java

@@ -52,42 +52,5 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/busdepositfictitious")
 public class BusDepositFictitiousRest implements BusDepositFictitiousFeign {
 
-	@Autowired
+	
-	private BusDepositFictitiousService busDepositFictitiousService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BusDepositFictitiousVo>> listPage(@RequestBody PagerQuery<BusDepositFictitiousQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusDepositFictitiousVo> pv = busDepositFictitiousService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BusDepositFictitiousDto dto){
-		ResultBean rb = ResultBean.fireFail();
-//		busDepositFictitiousService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		busDepositFictitiousService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusDepositFictitiousDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BusDepositFictitiousDetailsVo vo = busDepositFictitiousService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousService.java

@@ -55,38 +55,6 @@ import java.util.List;
 @Service
 public class BusDepositFictitiousService extends MybatisBaseService<BusDepositFictitiousMapper, BusDepositFictitious> {
 
-    @Autowired
-    private BusSalesOrderDepositService busSalesOrderDepositService;
-
-    private QueryWrapper<BusDepositFictitious> createQueryWrapper(BusDepositFictitiousQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BusDepositFictitious> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<BusDepositFictitiousVo> listPageVo(PagerQuery<BusDepositFictitiousQuery> pq) {
-        BusDepositFictitiousQuery query = pq.getParams();
-        QueryWrapper<BusDepositFictitious> qw = createQueryWrapper(query);
-        IPage<BusDepositFictitious> page = PagerUtil.queryToPage(pq);
-        IPage<BusDepositFictitiousVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<BusDepositFictitiousVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void insertByDto(BusDepositFictitiousDto dto) {
-        BusDepositFictitious entity = new BusDepositFictitious();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public BusDepositFictitiousDetailsVo fetchDetailsVoBySid(String sid) {
-        BusDepositFictitious entity = fetchBySid(sid);
-        BusDepositFictitiousDetailsVo vo = new BusDepositFictitiousDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
-
     public void saveFictitious(List<BusDepositFictitiousDto> busDepositFictitiousDtoList, String sid) {
         for (int i = 0; i < busDepositFictitiousDtoList.size(); i++) {
             BusDepositFictitious busDepositFictitious = new BusDepositFictitious();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java

@@ -54,19 +54,8 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDeposit> {
 
-    //@Update("update bus_sales_order_deposit set name=#{msg} where id=#{id}")
-    //IPage<BusSalesOrderDepositVo> voPage(IPage<BusSalesOrderDeposit> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderDeposit> qw);
-
-    IPage<BusSalesOrderDepositVo> selectPageVo(IPage<BusSalesOrderDeposit> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderDeposit> qw);
-
-    List<BusSalesOrderDepositVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderDeposit> qw);
-
-    @Select("select * from bus_sales_order_deposit")
-    List<BusSalesOrderDepositVo> selectListVo();
-
     BusSalesOrderDeposit selectByOrderSid(String sid);
 
-//    BusSalesOrderDepositDetailsVo selectOrderDepositStateBySid(@Param("saleOrderSid") String saleOrderSid);
 
     /**
      * 根据销售订单sid查询订金信息

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@@ -3,34 +3,13 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo">
-        SELECT *
-        FROM bus_sales_order_deposit
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositVo">
-        SELECT *
-        FROM bus_sales_order_deposit
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 
     <select id="selectByOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit">
         select *
         from bus_sales_order_deposit
         where salesOrderSid = #{sid}
     </select>
-
+    
-    <select id="selectOrderDepositStateBySid"
-            resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo">
-        SELECT *
-        FROM bus_sales_order_deposit
-        WHERE salesOrderSid = #{sid}
-    </select>
     <!--根据销售订单sid查询订金信息-->
     <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDepositDetailsVo">
         select sid,

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositRest.java

@@ -51,43 +51,5 @@ import org.springframework.web.bind.annotation.*;
 @RestController("com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositRest")
 @RequestMapping("v1/bussalesorderdeposit")
 public class BusSalesOrderDepositRest implements BusSalesOrderDepositFeign {
-
+	
-	@Autowired
-	private BusSalesOrderDepositService busSalesOrderDepositService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BusSalesOrderDepositVo>> listPage(@RequestBody PagerQuery<BusSalesOrderDepositQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusSalesOrderDepositVo> pv = busSalesOrderDepositService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BusSalesOrderDepositDto dto){
-		ResultBean rb = ResultBean.fireFail();
-//		busSalesOrderDepositService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		busSalesOrderDepositService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesOrderDepositDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BusSalesOrderDepositDetailsVo vo = busSalesOrderDepositService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -50,34 +50,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrderDepositMapper, BusSalesOrderDeposit> {
-    private QueryWrapper<BusSalesOrderDeposit> createQueryWrapper(BusSalesOrderDepositQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BusSalesOrderDeposit> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<BusSalesOrderDepositVo> listPageVo(PagerQuery<BusSalesOrderDepositQuery> pq) {
-        BusSalesOrderDepositQuery query = pq.getParams();
-        QueryWrapper<BusSalesOrderDeposit> qw = createQueryWrapper(query);
-        IPage<BusSalesOrderDeposit> page = PagerUtil.queryToPage(pq);
-        IPage<BusSalesOrderDepositVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<BusSalesOrderDepositVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void insertByDto(BusSalesOrderDepositDto dto) {
-        BusSalesOrderDeposit entity = new BusSalesOrderDeposit();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public BusSalesOrderDepositDetailsVo fetchDetailsVoBySid(String sid) {
-        BusSalesOrderDeposit entity = fetchBySid(sid);
-        BusSalesOrderDepositDetailsVo vo = new BusSalesOrderDepositDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
 
     public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
@@ -116,15 +88,5 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     public int deleteByOrderSid(String sid) {
         return baseMapper.deleteByOrderSid(sid);
     }
-
+    
-    /**
-     * 查询销售订单订金状态
-     *
-     * @param saleOrderSid
-     * @return
-     */
-   /* public BusSalesOrderDepositDetailsVo selectOrderDepositStateBySid(String saleOrderSid) {
-        return baseMapper.selectOrderDepositStateBySid(saleOrderSid);
-
-    }*/
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.java

@@ -53,16 +53,7 @@ import java.util.List;
  */
 @Mapper
 public interface BusSalesOrderDiscountMapper extends BaseMapper<BusSalesOrderDiscount> {
-
+    
-    //@Update("update bus_sales_order_discount set name=#{msg} where id=#{id}")
-    //IPage<BusSalesOrderDiscountVo> voPage(IPage<BusSalesOrderDiscount> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderDiscount> qw);
-
-    IPage<BusSalesOrderDiscountVo> selectPageVo(IPage<BusSalesOrderDiscount> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderDiscount> qw);
-
-    List<BusSalesOrderDiscountVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderDiscount> qw);
-
-    @Select("select * from bus_sales_order_discount")
-    List<BusSalesOrderDiscountVo> selectListVo();
 
     int deleteList(String sid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountMapper.xml

@@ -3,21 +3,6 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountVo">
-        SELECT *
-        FROM bus_sales_order_discount
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscountVo">
-        SELECT *
-        FROM bus_sales_order_discount
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 
     <delete id="deleteList">
         delete

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountRest.java

@@ -52,42 +52,5 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/bussalesorderdiscount")
 public class BusSalesOrderDiscountRest implements BusSalesOrderDiscountFeign {
 
-	@Autowired
+	
-	private BusSalesOrderDiscountService busSalesOrderDiscountService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BusSalesOrderDiscountVo>> listPage(@RequestBody PagerQuery<BusSalesOrderDiscountQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusSalesOrderDiscountVo> pv = busSalesOrderDiscountService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BusSalesOrderDiscountDto dto){
-		ResultBean rb = ResultBean.fireFail();
-//		busSalesOrderDiscountService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		busSalesOrderDiscountService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesOrderDiscountDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BusSalesOrderDiscountDetailsVo vo = busSalesOrderDiscountService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdiscount/BusSalesOrderDiscountService.java

@@ -52,35 +52,7 @@ import java.util.List;
  */
 @Service
 public class BusSalesOrderDiscountService extends MybatisBaseService<BusSalesOrderDiscountMapper, BusSalesOrderDiscount> {
-    private QueryWrapper<BusSalesOrderDiscount> createQueryWrapper(BusSalesOrderDiscountQuery query) {
+   
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BusSalesOrderDiscount> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<BusSalesOrderDiscountVo> listPageVo(PagerQuery<BusSalesOrderDiscountQuery> pq) {
-        BusSalesOrderDiscountQuery query = pq.getParams();
-        QueryWrapper<BusSalesOrderDiscount> qw = createQueryWrapper(query);
-        IPage<BusSalesOrderDiscount> page = PagerUtil.queryToPage(pq);
-        IPage<BusSalesOrderDiscountVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<BusSalesOrderDiscountVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void insertByDto(BusSalesOrderDiscountDto dto) {
-        BusSalesOrderDiscount entity = new BusSalesOrderDiscount();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public BusSalesOrderDiscountDetailsVo fetchDetailsVoBySid(String sid) {
-        BusSalesOrderDiscount entity = fetchBySid(sid);
-        BusSalesOrderDiscountDetailsVo vo = new BusSalesOrderDiscountDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
-
     public void saveDiscount(List<BusSalesOrderDiscountDto> busSalesOrderDiscountList, String sid) {
         //删除原有的
         baseMapper.deleteList(sid);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.java

@@ -25,18 +25,11 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesorderinsurance;
 
-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.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
 import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
-import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo;
-
-import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -54,15 +47,6 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderInsuranceMapper extends BaseMapper<BusSalesOrderInsurance> {
 
-    //@Update("update bus_sales_order_insurance set name=#{msg} where id=#{id}")
-    //IPage<BusSalesOrderInsuranceVo> voPage(IPage<BusSalesOrderInsurance> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderInsurance> qw);
-
-    IPage<BusSalesOrderInsuranceVo> selectPageVo(IPage<BusSalesOrderInsurance> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderInsurance> qw);
-
-    List<BusSalesOrderInsuranceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderInsurance> qw);
-
-    @Select("select * from bus_sales_order_insurance")
-    List<BusSalesOrderInsuranceVo> selectListVo();
 
     int deleteByOrderSid(String sid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceMapper.xml

@@ -3,22 +3,7 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo">
+   
-        SELECT *
-        FROM bus_sales_order_insurance
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo"
-            resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceVo">
-        SELECT *
-        FROM bus_sales_order_insurance
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
     <select id="selectOrderInsuranceStateBySid"
             resultType="com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo">
         SELECT *

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceRest.java

@@ -52,42 +52,5 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/bussalesorderinsurance")
 public class BusSalesOrderInsuranceRest implements BusSalesOrderInsuranceFeign {
 
-	@Autowired
+	
-	private BusSalesOrderInsuranceService busSalesOrderInsuranceService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BusSalesOrderInsuranceVo>> listPage(@RequestBody PagerQuery<BusSalesOrderInsuranceQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusSalesOrderInsuranceVo> pv = busSalesOrderInsuranceService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BusSalesOrderInsuranceDto dto){
-		ResultBean rb = ResultBean.fireFail();
-//		busSalesOrderInsuranceService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		busSalesOrderInsuranceService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesOrderInsuranceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BusSalesOrderInsuranceDetailsVo vo = busSalesOrderInsuranceService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderinsurance/BusSalesOrderInsuranceService.java

@@ -26,13 +26,10 @@
 package com.yxt.anrui.buscenter.biz.bussalesorderinsurance;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsurance;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesorderinsurance.*;
+import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDto;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -50,28 +47,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOrderInsuranceMapper, BusSalesOrderInsurance> {
-    private QueryWrapper<BusSalesOrderInsurance> createQueryWrapper(BusSalesOrderInsuranceQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BusSalesOrderInsurance> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<BusSalesOrderInsuranceVo> listPageVo(PagerQuery<BusSalesOrderInsuranceQuery> pq) {
-        BusSalesOrderInsuranceQuery query = pq.getParams();
-        QueryWrapper<BusSalesOrderInsurance> qw = createQueryWrapper(query);
-        IPage<BusSalesOrderInsurance> page = PagerUtil.queryToPage(pq);
-        IPage<BusSalesOrderInsuranceVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<BusSalesOrderInsuranceVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public BusSalesOrderInsuranceDetailsVo fetchDetailsVoBySid(String sid) {
-        BusSalesOrderInsurance entity = fetchBySid(sid);
-        BusSalesOrderInsuranceDetailsVo vo = new BusSalesOrderInsuranceDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
 
     public void saveInsurance(BusSalesOrderInsuranceDto busSalesOrderInsuranceDto, String sid) {
         BusSalesOrderInsurance busSalesOrderInsurance = new BusSalesOrderInsurance();
@@ -105,6 +80,6 @@ public class BusSalesOrderInsuranceService extends MybatisBaseService<BusSalesOr
     }
 
     public int updateByOrderSid(String sid, String remarks) {
-        return baseMapper.updateByOrderSid(sid,remarks);
+        return baseMapper.updateByOrderSid(sid, remarks);
     }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.java

@@ -25,18 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesordermakeup;
 
-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.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
 import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeup;
-import com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo;
-
-import java.util.List;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -54,15 +46,6 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeup> {
 
-    //@Update("update bus_sales_order_makeup set name=#{msg} where id=#{id}")
-    //IPage<BusSalesOrderMakeupVo> voPage(IPage<BusSalesOrderMakeup> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderMakeup> qw);
-
-    IPage<BusSalesOrderMakeupVo> selectPageVo(IPage<BusSalesOrderMakeup> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderMakeup> qw);
-
-    List<BusSalesOrderMakeupVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderMakeup> qw);
-
-    @Select("select * from bus_sales_order_makeup")
-    List<BusSalesOrderMakeupVo> selectListVo();
 
     /**
      * 根据销售订单sid删除上装配置信息
@@ -72,7 +55,6 @@ public interface BusSalesOrderMakeupMapper extends BaseMapper<BusSalesOrderMakeu
      */
     int deleteBySalesOrderSid(String sid);
 
-//    BusSalesOrderMakeupDetailsVo selectOrderMakeupStateBySid(@Param("saleOrderSid") String saleOrderSid);
 
     /**
      * 根据销售订单sid查询销售订单的上装配置

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupMapper.xml

@@ -3,28 +3,6 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo">
-        SELECT *
-        FROM bus_sales_order_makeup
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupVo">
-        SELECT *
-        FROM bus_sales_order_makeup
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectOrderMakeupStateBySid"
-            resultType="com.yxt.anrui.buscenter.api.bussalesordermakeup.BusSalesOrderMakeupDetailsVo">
-        SELECT *
-        FROM bus_sales_order_makeup
-        WHERE salesOrderSid = #{sid}
-    </select>
 
     <!--根据销售订单删除该销售订单的上装配置-->
     <delete id="deleteBySalesOrderSid">
@@ -43,7 +21,8 @@
                announcementModel,
                topPrice,
                moreConfig,
-               contractPath,remarks
+               contractPath,
+               remarks
         from bus_sales_order_makeup
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupRest.java

@@ -51,43 +51,5 @@ import org.springframework.web.bind.annotation.*;
 @RestController("com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupRest")
 @RequestMapping("v1/bussalesordermakeup")
 public class BusSalesOrderMakeupRest implements BusSalesOrderMakeupFeign {
-
+	
-	@Autowired
-	private BusSalesOrderMakeupService busSalesOrderMakeupService;
-
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BusSalesOrderMakeupVo>> listPage(@RequestBody PagerQuery<BusSalesOrderMakeupQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusSalesOrderMakeupVo> pv = busSalesOrderMakeupService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BusSalesOrderMakeupDto dto){
-		ResultBean rb = ResultBean.fireFail();
-//		busSalesOrderMakeupService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		busSalesOrderMakeupService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesOrderMakeupDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BusSalesOrderMakeupDetailsVo vo = busSalesOrderMakeupService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermakeup/BusSalesOrderMakeupService.java

@@ -50,34 +50,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrderMakeupMapper, BusSalesOrderMakeup> {
-    private QueryWrapper<BusSalesOrderMakeup> createQueryWrapper(BusSalesOrderMakeupQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BusSalesOrderMakeup> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<BusSalesOrderMakeupVo> listPageVo(PagerQuery<BusSalesOrderMakeupQuery> pq) {
-        BusSalesOrderMakeupQuery query = pq.getParams();
-        QueryWrapper<BusSalesOrderMakeup> qw = createQueryWrapper(query);
-        IPage<BusSalesOrderMakeup> page = PagerUtil.queryToPage(pq);
-        IPage<BusSalesOrderMakeupVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<BusSalesOrderMakeupVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void insertByDto(BusSalesOrderMakeupDto dto) {
-        BusSalesOrderMakeup entity = new BusSalesOrderMakeup();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public BusSalesOrderMakeupDetailsVo fetchDetailsVoBySid(String sid) {
-        BusSalesOrderMakeup entity = fetchBySid(sid);
-        BusSalesOrderMakeupDetailsVo vo = new BusSalesOrderMakeupDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
 
     public void saveMake(BusSalesOrderMakeupDto busSalesOrderMakeupDto, String sid) {
         BusSalesOrderMakeup busSalesOrderMakeup = new BusSalesOrderMakeup();
@@ -105,14 +77,5 @@ public class BusSalesOrderMakeupService extends MybatisBaseService<BusSalesOrder
     public BusSalesOrderMakeupDetailsVo details(String sid) {
         return baseMapper.details(sid);
     }
-
+    
-    /**
-     * 查询销售订单上装信息状态
-     *
-     * @param saleOrderSid
-     * @return
-     */
-    /*public BusSalesOrderMakeupDetailsVo selectOrderMakeupStateBySid(String saleOrderSid) {
-        return baseMapper.selectOrderMakeupStateBySid(saleOrderSid);
-    }*/
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.java

@@ -29,7 +29,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
-import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo;
@@ -54,21 +53,10 @@ import java.util.List;
  */
 @Mapper
 public interface BusSalesOrderModelMapper extends BaseMapper<BusSalesOrderModel> {
-
+    
-    //@Update("update bus_sales_order_model set name=#{msg} where id=#{id}")
-    //IPage<BusSalesOrderModelVo> voPage(IPage<BusSalesOrderModel> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderModel> qw);
-
-    IPage<BusSalesOrderModelVo> selectPageVo(IPage<BusSalesOrderModel> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderModel> qw);
-
-    List<BusSalesOrderModelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderModel> qw);
-
-    @Select("select * from bus_sales_order_model")
-    List<BusSalesOrderModelVo> selectListVo();
 
     BusSalesOrderModel selectBySalesSid(String sid);
 
-//    BusSalesOrderModelDetailsVo selectOrderModelStateBySid(@Param("saleOrderSid") String saleOrderSid);
-
 
     /**
      * 根据销售订单sid查询销售订单主车车型信息

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@@ -3,34 +3,12 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesordermodel.BusSalesOrderModelMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo">
-        SELECT *
-        FROM bus_sales_order_model
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelVo">
-        SELECT *
-        FROM bus_sales_order_model
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 
     <select id="selectBySalesSid" resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel">
         select *
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>
-
-    <select id="selectOrderModelStateBySid"
-            resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo">
-        select *
-        from bus_sales_order_model
-        where salesOrderSid = #{sid}
-    </select>
     <!--根据销售订单sid查询主车车型信息-->
     <select id="details" resultType="com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo">
         select modelSid,
@@ -44,7 +22,7 @@
                finalPrice,
                brandName,
                brandSid,
-        type
+               type
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelRest.java

@@ -25,14 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 
-import com.yxt.anrui.buscenter.api.bussalesordermodel.*;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelFeign;
-import com.yxt.common.core.query.PagerQuery;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppBusSalesOrderModelDto;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -52,33 +50,9 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/bussalesordermodel")
 public class BusSalesOrderModelRest implements BusSalesOrderModelFeign {
 
-	@Autowired
-	private BusSalesOrderModelService busSalesOrderModelService;
 
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    public ResultBean save(AppBusSalesOrderModelDto dto) {
-	@PostMapping("/listPage")
+        return null;
-	public ResultBean<PagerVo<BusSalesOrderModelVo>> listPage(@RequestBody PagerQuery<BusSalesOrderModelQuery> pq){
+    }
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusSalesOrderModelVo> pv = busSalesOrderModelService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BusSalesOrderModelDto dto){
-		ResultBean rb = ResultBean.fireFail();
-//		busSalesOrderModelService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		busSalesOrderModelService.delBySids(sids);
-		return rb.success();
-	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelService.java

@@ -26,14 +26,11 @@
 package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.AppOrderInfo;
-import com.yxt.anrui.buscenter.api.bussalesordermodel.*;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDetailsVo;
+import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModelDto;
 import com.yxt.common.base.service.MybatisBaseService;
-import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Service;
 
 /**
@@ -51,34 +48,6 @@ import org.springframework.stereotype.Service;
  */
 @Service
 public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderModelMapper, BusSalesOrderModel> {
-    private QueryWrapper<BusSalesOrderModel> createQueryWrapper(BusSalesOrderModelQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BusSalesOrderModel> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<BusSalesOrderModelVo> listPageVo(PagerQuery<BusSalesOrderModelQuery> pq) {
-        BusSalesOrderModelQuery query = pq.getParams();
-        QueryWrapper<BusSalesOrderModel> qw = createQueryWrapper(query);
-        IPage<BusSalesOrderModel> page = PagerUtil.queryToPage(pq);
-        IPage<BusSalesOrderModelVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<BusSalesOrderModelVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void insertByDto(BusSalesOrderModelDto dto) {
-        BusSalesOrderModel entity = new BusSalesOrderModel();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public BusSalesOrderModelDetailsVo fetchDetailsVoBySid(String sid) {
-        BusSalesOrderModel entity = fetchBySid(sid);
-        BusSalesOrderModelDetailsVo vo = new BusSalesOrderModelDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
 
     public void saveModel(BusSalesOrderModelDto busSalesOrderModelDto, String sid) {
         //根据销售订单sid查询该订单的主车型
@@ -131,14 +100,4 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             return new AppOrderInfo();
         }
     }
-
-    /**
-     * 查询销售订单车型状态
-     *
-     * @param saleOrderSid
-     * @return
-     */
-   /* public BusSalesOrderModelDetailsVo selectOrderModelStateBySid(String saleOrderSid) {
-        return baseMapper.selectOrderModelStateBySid(saleOrderSid);
-    }*/
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.java

@@ -54,15 +54,6 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderPriceMapper extends BaseMapper<BusSalesOrderPrice> {
 
-    //@Update("update bus_sales_order_price set name=#{msg} where id=#{id}")
-    //IPage<BusSalesOrderPriceVo> voPage(IPage<BusSalesOrderPrice> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderPrice> qw);
-
-    IPage<BusSalesOrderPriceVo> selectPageVo(IPage<BusSalesOrderPrice> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderPrice> qw);
-
-    List<BusSalesOrderPriceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderPrice> qw);
-
-    @Select("select * from bus_sales_order_price")
-    List<BusSalesOrderPriceVo> selectListVo();
 
     BusSalesOrderPrice selectBySalesOrderSid(String sid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceMapper.xml

@@ -3,21 +3,6 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo">
-        SELECT *
-        FROM bus_sales_order_price
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceVo">
-        SELECT *
-        FROM bus_sales_order_price
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 
     <select id="selectBySalesOrderSid" resultType="com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice">
         select *

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceRest.java

@@ -25,14 +25,12 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesorderprice;
 
-import com.yxt.anrui.buscenter.api.bussalesorderprice.*;
+import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPriceFeign;
-import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -52,49 +50,13 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/bussalesorderprice")
 public class BusSalesOrderPriceRest implements BusSalesOrderPriceFeign {
 
-	@Autowired
+    @Autowired
-	private BusSalesOrderPriceService busSalesOrderPriceService;
+    private BusSalesOrderPriceService busSalesOrderPriceService;
 
-	@Override
+    @Override
-	@ApiOperation("根据条件分页查询数据的列表")
+    public ResultBean<String> getPriceByOrderSid(String busSid) {
-	@PostMapping("/listPage")
+        ResultBean rb = ResultBean.fireFail();
-	public ResultBean<PagerVo<BusSalesOrderPriceVo>> listPage(@RequestBody PagerQuery<BusSalesOrderPriceQuery> pq){
+        String price = busSalesOrderPriceService.getPriceByOrderSid(busSid);
-		ResultBean rb = ResultBean.fireFail();
+        return rb.success().setData(price);
-		PagerVo<BusSalesOrderPriceVo> pv = busSalesOrderPriceService.listPageVo(pq);
+    }
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BusSalesOrderPriceDto dto){
-		ResultBean rb = ResultBean.fireFail();
-//		busSalesOrderPriceService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		busSalesOrderPriceService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesOrderPriceDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BusSalesOrderPriceDetailsVo vo = busSalesOrderPriceService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
-
-	@Override
-	public ResultBean<String> getPriceByOrderSid(String busSid) {
-		ResultBean rb = ResultBean.fireFail();
-		String price = busSalesOrderPriceService.getPriceByOrderSid(busSid);
-		return rb.success().setData(price);
-	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderprice/BusSalesOrderPriceService.java

@@ -52,28 +52,6 @@ import java.math.BigDecimal;
  */
 @Service
 public class BusSalesOrderPriceService extends MybatisBaseService<BusSalesOrderPriceMapper, BusSalesOrderPrice> {
-    private QueryWrapper<BusSalesOrderPrice> createQueryWrapper(BusSalesOrderPriceQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BusSalesOrderPrice> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<BusSalesOrderPriceVo> listPageVo(PagerQuery<BusSalesOrderPriceQuery> pq) {
-        BusSalesOrderPriceQuery query = pq.getParams();
-        QueryWrapper<BusSalesOrderPrice> qw = createQueryWrapper(query);
-        IPage<BusSalesOrderPrice> page = PagerUtil.queryToPage(pq);
-        IPage<BusSalesOrderPriceVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<BusSalesOrderPriceVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public BusSalesOrderPriceDetailsVo fetchDetailsVoBySid(String sid) {
-        BusSalesOrderPrice entity = fetchBySid(sid);
-        BusSalesOrderPriceDetailsVo vo = new BusSalesOrderPriceDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
 
     public void saveOrderPrice(BusSalesOrderPriceDto busSalesOrderPriceDto, String sid) {
         BusSalesOrderPrice busSalesOrderPrice = new BusSalesOrderPrice();

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.java

@@ -25,16 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesordervehicle;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Constants;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleDetailsVo;
-import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleVo;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
@@ -54,15 +48,6 @@ import java.util.List;
 @Mapper
 public interface BusSalesOrderVehicleMapper extends BaseMapper<BusSalesOrderVehicle> {
 
-    //@Update("update bus_sales_order_vehicle set name=#{msg} where id=#{id}")
-    //IPage<BusSalesOrderVehicleVo> voPage(IPage<BusSalesOrderVehicle> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesOrderVehicle> qw);
-
-    IPage<BusSalesOrderVehicleVo> selectPageVo(IPage<BusSalesOrderVehicle> page, @Param(Constants.WRAPPER) Wrapper<BusSalesOrderVehicle> qw);
-
-    List<BusSalesOrderVehicleVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesOrderVehicle> qw);
-
-    @Select("select * from bus_sales_order_vehicle")
-    List<BusSalesOrderVehicleVo> selectListVo();
 
     List<BusSalesOrderVehicle> selectVehicleList(String sid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleMapper.xml

@@ -3,21 +3,6 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesordervehicle.BusSalesOrderVehicleMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleVo">
-        SELECT *
-        FROM bus_sales_order_vehicle
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleVo">
-        SELECT *
-        FROM bus_sales_order_vehicle
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 
     <select id="selectVehicleList" resultType="com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle">
         select *

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleRest.java

@@ -52,42 +52,5 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/bussalesordervehicle")
 public class BusSalesOrderVehicleRest implements BusSalesOrderVehicleFeign {
 
-    @Autowired
-    private BusSalesOrderVehicleService busSalesOrderVehicleService;
 
-    @Override
-    @ApiOperation("根据条件分页查询数据的列表")
-    @PostMapping("/listPage")
-    public ResultBean<PagerVo<BusSalesOrderVehicleVo>> listPage(@RequestBody PagerQuery<BusSalesOrderVehicleQuery> pq) {
-        ResultBean rb = ResultBean.fireFail();
-        PagerVo<BusSalesOrderVehicleVo> pv = busSalesOrderVehicleService.listPageVo(pq);
-        return rb.success().setData(pv);
-    }
-
-    @Override
-    @ApiOperation("新增或修改")
-    @PostMapping("/save")
-    public ResultBean save(@RequestBody BusSalesOrderVehicleDto dto) {
-        ResultBean rb = ResultBean.fireFail();
-//        busSalesOrderVehicleService.saveOrUpdateDto(dto);
-        return rb.success();
-    }
-
-    @Override
-    @ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids) {
-        ResultBean rb = ResultBean.fireFail();
-        busSalesOrderVehicleService.delBySids(sids);
-        return rb.success();
-    }
-
-    @Override
-    @ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesOrderVehicleDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid) {
-        ResultBean rb = ResultBean.fireFail();
-        BusSalesOrderVehicleDetailsVo vo = busSalesOrderVehicleService.fetchDetailsVoBySid(sid);
-        return rb.success().setData(vo);
-    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordervehicle/BusSalesOrderVehicleService.java

@@ -54,34 +54,6 @@ import java.util.List;
  */
 @Service
 public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrderVehicleMapper, BusSalesOrderVehicle> {
-    private QueryWrapper<BusSalesOrderVehicle> createQueryWrapper(BusSalesOrderVehicleQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BusSalesOrderVehicle> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<BusSalesOrderVehicleVo> listPageVo(PagerQuery<BusSalesOrderVehicleQuery> pq) {
-        BusSalesOrderVehicleQuery query = pq.getParams();
-        QueryWrapper<BusSalesOrderVehicle> qw = createQueryWrapper(query);
-        IPage<BusSalesOrderVehicle> page = PagerUtil.queryToPage(pq);
-        IPage<BusSalesOrderVehicleVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<BusSalesOrderVehicleVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void insertByDto(BusSalesOrderVehicleDto dto) {
-        BusSalesOrderVehicle entity = new BusSalesOrderVehicle();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public BusSalesOrderVehicleDetailsVo fetchDetailsVoBySid(String sid) {
-        BusSalesOrderVehicle entity = fetchBySid(sid);
-        BusSalesOrderVehicleDetailsVo vo = new BusSalesOrderVehicleDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
 
     public void saveVehicle(List<BusSalesOrderVehicleDto> list, String sid) {
         List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(sid);
@@ -104,6 +76,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
 
     /**
      * 根据销售订单sid删除该销售订单下的现车车辆信息
+     *
      * @param sid 销售订单sid
      * @return
      */
@@ -111,7 +84,7 @@ public class BusSalesOrderVehicleService extends MybatisBaseService<BusSalesOrde
         return baseMapper.deleteByOrderSid(sid);
     }
 
-    public  List<AppNowCarList> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
+    public List<AppNowCarList> selectAppDetailsVoBySaleOrderSid(String saleOrderSid) {
         List<BusSalesOrderVehicle> stringList = baseMapper.selectVehicleList(saleOrderSid);
         List<AppNowCarList> appNowCars = new ArrayList<>();
         for (BusSalesOrderVehicle busSalesOrderVehicle : stringList) {

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.java

@@ -53,16 +53,7 @@ import java.util.List;
  */
 @Mapper
 public interface BusSalesVehicleOrderMapper extends BaseMapper<BusSalesVehicleOrder> {
-
+    
-    //@Update("update bus_sales_vehicle_order set name=#{msg} where id=#{id}")
-    //IPage<BusSalesVehicleOrderVo> voPage(IPage<BusSalesVehicleOrder> page, @Param(Constants.WRAPPER) QueryWrapper<BusSalesVehicleOrder> qw);
-
-    IPage<BusSalesVehicleOrderVo> selectPageVo(IPage<BusSalesVehicleOrder> page, @Param(Constants.WRAPPER) Wrapper<BusSalesVehicleOrder> qw);
-
-    List<BusSalesVehicleOrderVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusSalesVehicleOrder> qw);
-
-    @Select("select * from bus_sales_vehicle_order")
-    List<BusSalesVehicleOrderVo> selectListVo();
 
     List<BusSalesVehicleOrder> selectVehicleList(String sid);
 

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderMapper.xml

@@ -3,21 +3,6 @@
 <mapper namespace="com.yxt.anrui.buscenter.biz.bussalesvehicleorder.BusSalesVehicleOrderMapper">
     <!--    <where> ${ew.sqlSegment} </where>-->
     <!--    ${ew.customSqlSegment} -->
-    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderVo">
-        SELECT *
-        FROM bus_sales_vehicle_order
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
-
-    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderVo">
-        SELECT *
-        FROM bus_sales_vehicle_order
-        <where>
-            ${ew.sqlSegment}
-        </where>
-    </select>
 
     <select id="selectVehicleList" resultType="com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrder">
         select *

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderRest.java

@@ -25,14 +25,10 @@
  *********************************************************/
 package com.yxt.anrui.buscenter.biz.bussalesvehicleorder;
 
-import com.yxt.anrui.buscenter.api.bussalesvehicleorder.*;
+import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderFeign;
-import com.yxt.common.core.query.PagerQuery;
-import com.yxt.common.core.result.ResultBean;
-import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
 
 /**
  * Project: anrui-buscenter(业务管理) <br/>
@@ -52,42 +48,5 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping("v1/bussalesvehicleorder")
 public class BusSalesVehicleOrderRest implements BusSalesVehicleOrderFeign {
 
-	@Autowired
-	private BusSalesVehicleOrderService busSalesVehicleOrderService;
 
-	@Override
-	@ApiOperation("根据条件分页查询数据的列表")
-	@PostMapping("/listPage")
-	public ResultBean<PagerVo<BusSalesVehicleOrderVo>> listPage(@RequestBody PagerQuery<BusSalesVehicleOrderQuery> pq){
-		ResultBean rb = ResultBean.fireFail();
-		PagerVo<BusSalesVehicleOrderVo> pv = busSalesVehicleOrderService.listPageVo(pq);
-		return rb.success().setData(pv);
-	}
-
-	@Override
-	@ApiOperation("新增或修改")
-	@PostMapping("/save")
-	public ResultBean save(@RequestBody BusSalesVehicleOrderDto dto){
-		ResultBean rb = ResultBean.fireFail();
-//		busSalesVehicleOrderService.saveOrUpdateDto(dto);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据sid批量删除")
-    @PostMapping("/delBySids")
-    public ResultBean delBySids(@RequestBody String[] sids){
-		ResultBean rb = ResultBean.fireFail();
-		busSalesVehicleOrderService.delBySids(sids);
-		return rb.success();
-	}
-
-	@Override
-	@ApiOperation("根据SID获取一条记录")
-    @GetMapping("/fetchDetailsBySid/{sid}")
-    public ResultBean<BusSalesVehicleOrderDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
-		ResultBean rb = ResultBean.fireFail();
-		BusSalesVehicleOrderDetailsVo vo = busSalesVehicleOrderService.fetchDetailsVoBySid(sid);
-		return rb.success().setData(vo);
-	}
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesvehicleorder/BusSalesVehicleOrderService.java

@@ -54,34 +54,6 @@ import java.util.List;
  */
 @Service
 public class BusSalesVehicleOrderService extends MybatisBaseService<BusSalesVehicleOrderMapper, BusSalesVehicleOrder> {
-    private QueryWrapper<BusSalesVehicleOrder> createQueryWrapper(BusSalesVehicleOrderQuery query) {
-        // todo: 这里根据具体业务调整查询条件
-        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
-        QueryWrapper<BusSalesVehicleOrder> qw = new QueryWrapper<>();
-        return qw;
-    }
-
-    public PagerVo<BusSalesVehicleOrderVo> listPageVo(PagerQuery<BusSalesVehicleOrderQuery> pq) {
-        BusSalesVehicleOrderQuery query = pq.getParams();
-        QueryWrapper<BusSalesVehicleOrder> qw = createQueryWrapper(query);
-        IPage<BusSalesVehicleOrder> page = PagerUtil.queryToPage(pq);
-        IPage<BusSalesVehicleOrderVo> pagging = baseMapper.selectPageVo(page, qw);
-        PagerVo<BusSalesVehicleOrderVo> p = PagerUtil.pageToVo(pagging, null);
-        return p;
-    }
-
-    public void insertByDto(BusSalesVehicleOrderDto dto) {
-        BusSalesVehicleOrder entity = new BusSalesVehicleOrder();
-        BeanUtil.copyProperties(dto, entity, "id", "sid");
-        baseMapper.insert(entity);
-    }
-
-    public BusSalesVehicleOrderDetailsVo fetchDetailsVoBySid(String sid) {
-        BusSalesVehicleOrder entity = fetchBySid(sid);
-        BusSalesVehicleOrderDetailsVo vo = new BusSalesVehicleOrderDetailsVo();
-        BeanUtil.copyProperties(entity, vo);
-        return vo;
-    }
 
     public void saveOrder(List<BusSalesVehicleOrderDto> vehicleList, String sid) {
         List<BusSalesVehicleOrder> stringList = baseMapper.selectVehicleList(sid);

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeign.java

@@ -9,6 +9,7 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -58,4 +59,8 @@ public interface ScmWarehouseFeign {
     @ApiOperation("根据SID获取一条记录")
     @GetMapping("/fetchBySid/{sid}")
     public ResultBean<ScmWarehouseVo> fetchBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("根据分公司sid获取存放地点信息")
+    @GetMapping("/fetchByUseOrgSid")
+    public ResultBean<List<Map<String,String>>> fetchByUseOrgSid(@RequestParam("sid") String sid);
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmwarehouse/ScmWarehouseFeignFallback.java

@@ -6,6 +6,7 @@ import com.yxt.common.core.vo.PagerVo;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -62,4 +63,9 @@ public class ScmWarehouseFeignFallback implements ScmWarehouseFeign {
         ResultBean rb = ResultBean.fireFail();
         return rb.setMsg("接口anrui-scm/scmwarehouse/fetchBySid无法访问");
     }
+
+    @Override
+    public ResultBean<List<Map<String, String>>> fetchByUseOrgSid(String sid) {
+        return null;
+    }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.java

@@ -36,6 +36,7 @@ import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouse;
 import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -62,4 +63,6 @@ public interface ScmWarehouseMapper extends BaseMapper<ScmWarehouse> {
 	
 	@Select("select * from scm_warehouse")
 	List<ScmWarehouseVo> selectListVo();
+
+	List<Map<String, String>> fetchByUseOrgSid(String sid);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseMapper.xml

@@ -10,4 +10,13 @@
 	<select id="selectListAllVo" resultType="com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo">
 		SELECT * FROM scm_warehouse <where> ${ew.sqlSegment} </where>
 	</select>
+
+	<select id="fetchByUseOrgSid" resultType="java.util.Map">
+		SELECT
+				sid,
+				warehouseName
+		FROM
+				scm_warehouse
+		WHERE useOrgSid = #{sid}
+	</select>
 </mapper>

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseRest.java

@@ -13,6 +13,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -97,4 +98,9 @@ public class ScmWarehouseRest implements ScmWarehouseFeign {
 		ScmWarehouseVo vo = scmWarehouseService.fetchBySidVo(sid);
 		return rb.success().setData(vo);
 	}
+
+	@Override
+	public ResultBean<List<Map<String, String>>> fetchByUseOrgSid(String sid) {
+		return scmWarehouseService.fetchByUseOrgSid(sid);
+	}
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmwarehouse/ScmWarehouseService.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: anrui-scm(进销存) <br/>
@@ -141,4 +142,10 @@ public class ScmWarehouseService extends MybatisBaseService<ScmWarehouseMapper,
 		}
 		return vo;
 	}
+
+	public ResultBean<List<Map<String, String>>> fetchByUseOrgSid(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		List<Map<String, String>> maps = baseMapper.fetchByUseOrgSid(sid);
+		return rb.success().setData(maps);
+	}
 }