diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
new file mode 100644
index 0000000000..878aec321e
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplication.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplication;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(外采管理)
+ * File: BaseOutsourcingApplication.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplication
+ * Description: 外采申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "外采申请表", description = "外采申请表")
+@TableName("base_outsourcing_application")
+@Data
+public class BaseOutsourcingApplication extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("申请编号")
+ private String applicationCode; // 申请编号
+ @ApiModelProperty("申请人姓名")
+ private String createByName; // 申请人姓名
+ @ApiModelProperty("申请日期")
+ private String applicationDate; // 申请日期
+ @ApiModelProperty("外采类型key")
+ private String externalMiningTypeKey; // 外采类型key
+ @ApiModelProperty("外采类型value")
+ private String externalMiningTypeValue; // 外采类型value
+ @ApiModelProperty("采购单位sid")
+ private String purchasingUnitSid; // 采购单位sid
+ @ApiModelProperty("采购单位名称")
+ private String purchasingUnitName; // 采购单位名称
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+ @ApiModelProperty("车型名称")
+ private String modelName; // 车型名称
+ @ApiModelProperty("常用配置名称")
+ private String configName; // 常用配置名称
+ @ApiModelProperty("采购价格")
+ private BigDecimal purchasePrice; // 采购价格
+ @ApiModelProperty("销售指导价")
+ private BigDecimal guidedPrice; // 销售指导价
+ @ApiModelProperty("厂家合同价")
+ private BigDecimal manufactorSettlementPrice; // 厂家合同价
+ @ApiModelProperty("台数")
+ private Integer num; // 台数
+ @ApiModelProperty("订金")
+ private BigDecimal deposit; // 订金
+ @ApiModelProperty("费用名称")
+ private String expenseName; // 费用名称
+ @ApiModelProperty("费用金额合计")
+ private BigDecimal totalExpenseAmount; // 费用金额合计
+ @ApiModelProperty("部门sid")
+ private String orgSid; // 部门sid
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
new file mode 100644
index 0000000000..1589780e5e
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDetailsVo.java
@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplication;
+
+
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(外采管理)
+ * File: BaseOutsourcingApplicationVo.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationVo
+ * Description: 外采申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "外采申请表 视图数据对象", description = "外采申请表 视图数据对象")
+@Data
+public class BaseOutsourcingApplicationDetailsVo implements Vo {
+
+ @ApiModelProperty("申请编号")
+ private String applicationCode; // 申请编号
+ @ApiModelProperty("申请人姓名")
+ private String createByName; // 申请人姓名
+ @ApiModelProperty("申请日期")
+ private String applicationDate; // 申请日期
+ @ApiModelProperty("外采类型key")
+ private String externalMiningTypeKey; // 外采类型key
+ @ApiModelProperty("外采类型value")
+ private String externalMiningTypeValue; // 外采类型value
+ @ApiModelProperty("采购单位sid")
+ private String purchasingUnitSid; // 采购单位sid
+ @ApiModelProperty("采购单位名称")
+ private String purchasingUnitName; // 采购单位名称
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+ @ApiModelProperty("车型名称")
+ private String modelName; // 车型名称
+ @ApiModelProperty("常用配置名称")
+ private String configName; // 常用配置名称
+ @ApiModelProperty("采购价格")
+ private String purchasePrice; // 采购价格
+ @ApiModelProperty("销售指导价")
+ private String guidedPrice; // 销售指导价
+ @ApiModelProperty("厂家合同价")
+ private String manufactorSettlementPrice; // 厂家合同价
+ @ApiModelProperty("台数")
+ private Integer num; // 台数
+ @ApiModelProperty("订金")
+ private String deposit; // 订金
+ @ApiModelProperty("费用名称")
+ private String expenseName; // 费用名称
+ @ApiModelProperty("费用金额合计")
+ private String totalExpenseAmount; // 费用金额合计
+ @ApiModelProperty("外采车辆列表")
+ private List baseOutsourcingApplicationVehicleVos; // 外采车辆列表
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
new file mode 100644
index 0000000000..64cf84f937
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationDto.java
@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplication;
+
+
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(外采管理)
+ * File: BaseOutsourcingApplicationDto.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDto
+ * Description: 外采申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "外采申请表 数据传输对象", description = "外采申请表 数据传输对象")
+@Data
+public class BaseOutsourcingApplicationDto implements Dto {
+
+ @ApiModelProperty("外采申请单sid")
+ private String sid; // 申请编号
+ @ApiModelProperty("用户sid")
+ private String userSid; // 用户sid
+ @ApiModelProperty("申请编号")
+ private String applicationCode; // 申请编号
+ @ApiModelProperty("申请人姓名")
+ private String createByName; // 申请人姓名
+ @ApiModelProperty("申请日期")
+ private String applicationDate; // 申请日期
+ @ApiModelProperty("外采类型key")
+ private String externalMiningTypeKey; // 外采类型key
+ @ApiModelProperty("外采类型value")
+ private String externalMiningTypeValue; // 外采类型value
+ @ApiModelProperty("采购单位sid")
+ private String purchasingUnitSid; // 采购单位sid
+ @ApiModelProperty("采购单位名称")
+ private String purchasingUnitName; // 采购单位名称
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+ @ApiModelProperty("车型名称")
+ private String modelName; // 车型名称
+ @ApiModelProperty("常用配置名称")
+ private String configName; // 常用配置名称
+ @ApiModelProperty("采购价格")
+ private String purchasePrice; // 采购价格
+ @ApiModelProperty("销售指导价")
+ private String guidedPrice; // 销售指导价
+ @ApiModelProperty("厂家合同价")
+ private String manufactorSettlementPrice; // 厂家合同价
+ @ApiModelProperty("台数")
+ private Integer num; // 台数
+ @ApiModelProperty("订金")
+ private String deposit; // 订金
+ @ApiModelProperty("费用名称")
+ private String expenseName; // 费用名称
+ @ApiModelProperty("费用金额合计")
+ private String totalExpenseAmount; // 费用金额合计
+ @ApiModelProperty("部门sid")
+ private String orgSid; // 部门sid
+ @ApiModelProperty("外采车辆列表")
+ private List baseOutsourcingApplicationVehicleDtos; // 外采车辆列表
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java
new file mode 100644
index 0000000000..3cbbd780c5
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeign.java
@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplication;
+
+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-base(外采管理)
+ * File: BaseOutsourcingApplicationFeign.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeign
+ * Description: 外采申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "外采申请表")
+@FeignClient(
+ contextId = "anrui-base-BaseOutsourcingApplication",
+ name = "anrui-base",
+ path = "baseoutsourcingapplication",
+ fallback = BaseOutsourcingApplicationFeignFallback.class)
+public interface BaseOutsourcingApplicationFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增修改保存")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody BaseOutsourcingApplicationDto dto);
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("编辑回显和详情")
+ @GetMapping("/fetchBySid/{sid}")
+ public ResultBean fetchBySid(@PathVariable("sid") String sid);
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java
new file mode 100644
index 0000000000..754b91c0a4
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationFeignFallback.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplication;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(外采管理)
+ * File: BaseOutsourcingApplicationFeignFallback.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationFeignFallback
+ * Description: 外采申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseOutsourcingApplicationFeignFallback implements BaseOutsourcingApplicationFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-base/baseoutsourcingapplication/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean saveOrUpdate(BaseOutsourcingApplicationDto dto){
+ return ResultBean.fireFail().setMsg("接口anrui-base/baseoutsourcingapplication/saveOrUpdate无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口anrui-base/baseoutsourcingapplication/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchBySid(String sid) {
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java
new file mode 100644
index 0000000000..f21ef7b617
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationQuery.java
@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplication;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(外采管理)
+ * File: BaseOutsourcingApplicationQuery.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationQuery
+ * Description: 外采申请表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "外采申请表 查询条件", description = "外采申请表 查询条件")
+@Data
+public class BaseOutsourcingApplicationQuery implements Query {
+
+ @ApiModelProperty("申请日期开始日期")
+ private String applicationStartDate; // 申请日期开始日期
+ @ApiModelProperty("申请日期结束日期")
+ private String applicationEndDate; // 申请日期结束日期
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java
new file mode 100644
index 0000000000..e9cdc8e7b5
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/BaseOutsourcingApplicationVo.java
@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplication;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(外采管理)
+ * File: BaseOutsourcingApplicationVo.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationVo
+ * Description: 外采申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "外采申请表 视图数据对象", description = "外采申请表 视图数据对象")
+@Data
+public class BaseOutsourcingApplicationVo implements Vo {
+
+ @ApiModelProperty("外采申请单sid")
+ private String sid; // 申请编号s
+ @ApiModelProperty("申请编号")
+ private String applicationCode; // 申请编号
+ @ApiModelProperty("申请日期")
+ private String applicationDate; // 申请日期
+ @ApiModelProperty("车型名称")
+ private String modelName; // 车型名称
+ @ApiModelProperty("台数")
+ private Integer num; // 台数
+ @ApiModelProperty("采购价格")
+ private String purchasePrice; // 采购价格
+ @ApiModelProperty("销售指导价")
+ private String guidedPrice; // 销售指导价
+ @ApiModelProperty("节点状态")
+ private String nodeState; // 节点状态
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicle.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicle.java
new file mode 100644
index 0000000000..871dbf7533
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicle.java
@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Project: anrui_base(外采车辆列表)
+ * File: BaseOutsourcingApplicationVehicle.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle
+ * Description: 外采申请车辆列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-11 09:25:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "外采申请车辆列表", description = "外采申请车辆列表")
+@TableName("base_outsourcing_application_vehicle")
+public class BaseOutsourcingApplicationVehicle extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+
+ @ApiModelProperty("外采申请单sid")
+ private String outAppSid; // 外采申请单sid
+
+ @ApiModelProperty("车架号")
+ private String VIN; // 车架号
+
+ /**
+ * @return 外采申请单sid
+ */
+ public String getOutAppSid(){
+ return outAppSid;
+ }
+
+ /**
+ * @param outAppSid 外采申请单sid to set
+ */
+ public void setOutAppSid(String outAppSid){
+ this.outAppSid = outAppSid;
+ }
+ /**
+ * @return 车架号
+ */
+ public String getVIN(){
+ return VIN;
+ }
+
+ /**
+ * @param VIN 车架号 to set
+ */
+ public void setVIN(String VIN){
+ this.VIN = VIN;
+ }
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleDto.java
new file mode 100644
index 0000000000..a3b7c4f23b
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleDto.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Project: anrui_base(外采车辆列表)
+ * File: BaseOutsourcingApplicationVehicleDto.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto
+ * Description: 外采申请车辆列表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-11 09:25:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "外采申请车辆列表 数据传输对象", description = "外采申请车辆列表 数据传输对象")
+public class BaseOutsourcingApplicationVehicleDto implements Dto {
+
+
+ @ApiModelProperty("外采申请单sid")
+ private String outAppSid; // 外采申请单sid
+
+ @ApiModelProperty("车架号")
+ private String VIN; // 车架号
+
+
+ /**
+ * @return 外采申请单sid
+ */
+ public String getOutAppSid(){
+ return outAppSid;
+ }
+
+ /**
+ * @param outAppSid 外采申请单sid to set
+ */
+ public void setOutAppSid(String outAppSid){
+ this.outAppSid = outAppSid;
+ }
+
+ /**
+ * @return 车架号
+ */
+ public String getVIN(){
+ return VIN;
+ }
+
+ /**
+ * @param VIN 车架号 to set
+ */
+ public void setVIN(String VIN){
+ this.VIN = VIN;
+ }
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleFeign.java
new file mode 100644
index 0000000000..762e99c8da
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleFeign.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle;
+
+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_base(外采车辆列表)
+ * File: BaseOutsourcingApplicationVehicleFeign.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleFeign
+ * Description: 外采申请车辆列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-11 09:25:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "外采申请车辆列表")
+@FeignClient(
+ contextId = "anrui_base-BaseOutsourcingApplicationVehicle",
+ name = "anrui_base",
+ path = "baseoutsourcingapplicationvehicle",
+ fallback = BaseOutsourcingApplicationVehicleFeignFallback.class)
+public interface BaseOutsourcingApplicationVehicleFeign {
+
+ @ApiOperation("新增保存")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody BaseOutsourcingApplicationVehicleDto dto);
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleFeignFallback.java
new file mode 100644
index 0000000000..70d2792735
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleFeignFallback.java
@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle;
+
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * Project: anrui_base(外采车辆列表)
+ * File: BaseOutsourcingApplicationVehicleFeignFallback.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleFeignFallback
+ * Description: 外采申请车辆列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-11 09:25:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseOutsourcingApplicationVehicleFeignFallback implements BaseOutsourcingApplicationVehicleFeign {
+
+ @Override
+ public ResultBean save(BaseOutsourcingApplicationVehicleDto dto){
+ return ResultBean.fireFail().setMsg("接口anrui_base/baseoutsourcingapplicationvehicle/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口anrui_base/baseoutsourcingapplicationvehicle/delBySids无法访问");
+ }
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleQuery.java
new file mode 100644
index 0000000000..442ad3f707
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleQuery.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Project: anrui_base(外采车辆列表)
+ * File: BaseOutsourcingApplicationVehicleQuery.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleQuery
+ * Description: 外采申请车辆列表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-11 09:25:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "外采申请车辆列表 查询条件", description = "外采申请车辆列表 查询条件")
+public class BaseOutsourcingApplicationVehicleQuery implements Query {
+
+
+ @ApiModelProperty("外采申请单sid")
+ private String outAppSid; // 外采申请单sid
+
+ @ApiModelProperty("车架号")
+ private String VIN; // 车架号
+
+
+ /**
+ * @return 外采申请单sid
+ */
+ public String getOutAppSid(){
+ return outAppSid;
+ }
+
+ /**
+ * @param outAppSid 外采申请单sid to set
+ */
+ public void setOutAppSid(String outAppSid){
+ this.outAppSid = outAppSid;
+ }
+
+ /**
+ * @return 车架号
+ */
+ public String getVIN(){
+ return VIN;
+ }
+
+ /**
+ * @param VIN 车架号 to set
+ */
+ public void setVIN(String VIN){
+ this.VIN = VIN;
+ }
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleVo.java
new file mode 100644
index 0000000000..53c1da8a29
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleVo.java
@@ -0,0 +1,85 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Project: anrui_base(外采车辆列表)
+ * File: BaseOutsourcingApplicationVehicleVo.java
+ * Class: com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo
+ * Description: 外采申请车辆列表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-11 09:25:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "外采申请车辆列表 视图数据对象", description = "外采申请车辆列表 视图数据对象")
+public class BaseOutsourcingApplicationVehicleVo implements Vo {
+
+
+ @ApiModelProperty("外采申请单sid")
+ private String outAppSid; // 外采申请单sid
+
+ @ApiModelProperty("车架号")
+ private String VIN; // 车架号
+
+
+ /**
+ * @return 外采申请单sid
+ */
+ public String getOutAppSid(){
+ return outAppSid;
+ }
+
+ /**
+ * @param outAppSid 外采申请单sid to set
+ */
+ public void setOutAppSid(String outAppSid){
+ this.outAppSid = outAppSid;
+ }
+
+ /**
+ * @return 车架号
+ */
+ public String getVIN(){
+ return VIN;
+ }
+
+ /**
+ * @param VIN 车架号 to set
+ */
+ public void setVIN(String VIN){
+ this.VIN = VIN;
+ }
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarPageQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarPageQuery.java
index 0818f7454f..4cabc627ca 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarPageQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseExistingCarPageQuery.java
@@ -10,6 +10,12 @@ public class BaseExistingCarPageQuery implements Query {
@ApiModelProperty(value = "车架号")
private String vinNo;
+ @ApiModelProperty(value = "车型sid")
+ private String modelSid;
+
+ @ApiModelProperty(value = "常用配置sid")
+ private String modelConfigSid;
+
@ApiModelProperty(value = "颜色")
private String carColor;
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java
index a9a59470e2..df9dcb5b27 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuery.java
@@ -53,4 +53,6 @@ public class BaseVehmodelConfigQuery implements Query {
@ApiModelProperty("车型sid")
private String modelSid; // 车型sid
+ @ApiModelProperty(value = "分公司sid")
+ private String useOrgSid;
}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.java
new file mode 100644
index 0000000000..bccc8f1770
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseoutsourcingapplication;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplication;
+import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(外采管理)
+ * File: BaseOutsourcingApplicationMapper.java
+ * Class: com.yxt.anrui.base.biz.baseoutsourcingapplication.BaseOutsourcingApplicationMapper
+ * Description: 外采申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseOutsourcingApplicationMapper extends BaseMapper {
+
+ //@Update("update base_outsourcing_application set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ BaseOutsourcingApplicationDetailsVo BaseOutsourcingApplicationDetailsVo(String sid);
+
+ int selectCountByOrgSid(@Param("billsType") String billsType, @Param("date") String date, @Param("orgSid") String orgSid);
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml
new file mode 100644
index 0000000000..3ce680bc35
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml
@@ -0,0 +1,22 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java
new file mode 100644
index 0000000000..76b34c0537
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationRest.java
@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseoutsourcingapplication;
+
+import com.yxt.anrui.base.api.baseoutsourcingapplication.*;
+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 java.util.List;
+
+/**
+ * Project: anrui-base(外采管理)
+ * File: BaseOutsourcingApplicationFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.baseoutsourcingapplication.BaseOutsourcingApplicationRest
+ * Description: 外采申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "外采申请表")
+@RestController("com.yxt.anrui.base.biz.baseoutsourcingapplication.BaseOutsourcingApplicationRest")
+@RequestMapping("/baseoutsourcingapplication")
+public class BaseOutsourcingApplicationRest implements BaseOutsourcingApplicationFeign {
+
+ @Autowired
+ private BaseOutsourcingApplicationService baseOutsourcingApplicationService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = baseOutsourcingApplicationService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增修改保存")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody BaseOutsourcingApplicationDto dto){
+ return baseOutsourcingApplicationService.saveOrUpdateDto(dto);
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ return baseOutsourcingApplicationService.delAllBySids(sids);
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchBySid/{sid}")
+ public ResultBean fetchBySid(@PathVariable("sid") String sid){
+ return baseOutsourcingApplicationService.fetchAllBySid(sid);
+ }
+}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
new file mode 100644
index 0000000000..98e2d520be
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@@ -0,0 +1,230 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseoutsourcingapplication;
+
+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.baseoutsourcingapplication.*;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
+import com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService;
+import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyPageVo;
+import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
+import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.portal.config.DictCommonType;
+import com.yxt.common.base.utils.DateUtils;
+import org.apache.commons.lang3.StringUtils;
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui-base(外采管理)
+ * File: BaseOutsourcingApplicationService.java
+ * Class: com.yxt.anrui.base.biz.baseoutsourcingapplication.BaseOutsourcingApplicationService
+ * Description: 外采申请表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-08 17:44:40
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseOutsourcingApplicationService extends MybatisBaseService {
+
+ @Autowired
+ private SysFormLinkFeign sysFormLinkFeign;
+ @Autowired
+ private BaseOutsourcingApplicationVehicleService baseOutsourcingApplicationVehicleService;
+ @Autowired
+ private DictCommonFeign dictCommonFeign;
+ @Autowired
+ private SysUserFeign sysUserFeign;
+ @Autowired
+ private SysOrganizationFeign sysOrganizationFeign;
+ @Autowired
+ private SysStaffOrgFeign sysStaffOrgFeign;
+
+ private QueryWrapper createQueryWrapper(BaseOutsourcingApplicationQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+ String applicationStartDate = query.getApplicationStartDate();
+ String applicationEndDate = query.getApplicationEndDate();
+ qw.apply(StringUtils.isNotEmpty(applicationStartDate), "date_format (applicationDate,'%Y-%m-%d') >= date_format('" + applicationStartDate + "','%Y-%m-%d')").
+ apply(StringUtils.isNotEmpty(applicationEndDate), "date_format (applicationDate,'%Y-%m-%d') <= date_format('" + applicationEndDate + "','%Y-%m-%d')"
+ );
+ if (StringUtils.isNotBlank(query.getModelSid())) {
+ qw.eq("modelSid", query.getModelSid());
+ }
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ BaseOutsourcingApplicationQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ List records = pagging.getRecords();
+ for (BaseOutsourcingApplicationVo record : records) {
+ String sid = record.getSid();
+ String nodeState = sysFormLinkFeign.selectStateByBusinessSid(sid).getData().getNodeState();
+ record.setNodeState(nodeState);
+ }
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public ResultBean saveOrUpdateDto(BaseOutsourcingApplicationDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ BaseOutsourcingApplication entity = new BaseOutsourcingApplication();
+ List baseOutsourcingApplicationVehicleDtos = dto.getBaseOutsourcingApplicationVehicleDtos();
+ String sid1 = entity.getSid();
+ String sid = dto.getSid();
+ if (StringUtils.isBlank(sid)){//新增
+ BeanUtil.copyProperties(dto,entity);
+ entity.setSid(sid1);
+ entity.setApplicationDate(new SimpleDateFormat("yyyy-MM-dd").format(new Date()));
+ entity.setApplicationCode(generateBillNo(dto.getUserSid()).get("billNo_Num"));
+ save(entity);
+ for (BaseOutsourcingApplicationVehicleDto baseOutsourcingApplicationVehicleDto : baseOutsourcingApplicationVehicleDtos) {
+ BaseOutsourcingApplicationVehicle baseOutsourcingApplicationVehicle = new BaseOutsourcingApplicationVehicle();
+ BeanUtil.copyProperties(baseOutsourcingApplicationVehicleDto,baseOutsourcingApplicationVehicle);
+ baseOutsourcingApplicationVehicle.setOutAppSid(sid1);
+ baseOutsourcingApplicationVehicleService.save(baseOutsourcingApplicationVehicle);
+ }
+ return rb.success().setMsg("添加成功");
+ }
+ updateBySid(dto,sid);
+ baseOutsourcingApplicationVehicleService.deleteByOutAppSid(sid);
+ for (BaseOutsourcingApplicationVehicleDto baseOutsourcingApplicationVehicleDto : baseOutsourcingApplicationVehicleDtos) {
+ BaseOutsourcingApplicationVehicle baseOutsourcingApplicationVehicle = new BaseOutsourcingApplicationVehicle();
+ BeanUtil.copyProperties(baseOutsourcingApplicationVehicleDto,baseOutsourcingApplicationVehicle);
+ baseOutsourcingApplicationVehicle.setOutAppSid(sid);
+ baseOutsourcingApplicationVehicleService.save(baseOutsourcingApplicationVehicle);
+ }
+ return rb.success().setMsg("修改成功");
+ }
+
+ public ResultBean delAllBySids(String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ delBySids(sids);
+ for (String sid : sids) {
+ baseOutsourcingApplicationVehicleService.deleteByOutAppSid(sid);
+ }
+ return rb.success().setMsg("删除成功");
+ }
+
+ public ResultBean fetchAllBySid(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ BaseOutsourcingApplicationDetailsVo baseOutsourcingApplicationDetailsVo = new BaseOutsourcingApplicationDetailsVo();
+ BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(sid);
+ BeanUtil.copyProperties(baseOutsourcingApplication,baseOutsourcingApplicationDetailsVo);
+ List baseOutsourcingApplicationVehicleVos = baseOutsourcingApplicationVehicleService.fetchByOutAppSid(sid);
+ baseOutsourcingApplicationDetailsVo.setBaseOutsourcingApplicationVehicleVos(baseOutsourcingApplicationVehicleVos);
+ return rb.success().setData(baseOutsourcingApplicationDetailsVo);
+ }
+
+ /**
+ * 生成单据编号(制定编号规则:单据类型编号(数据字典key)+部门编码+yyyyMMDD+0000)
+ * @param userSid
+ * @return
+ */
+ public Map generateBillNo(String userSid){
+ List commonVoList = dictCommonFeign.getTypeValues(DictCommonType.BILLSTYPE, "0").getData();
+ String billsType = "";
+ if (commonVoList.size() > 0) {
+ for (int i = 0; i < commonVoList.size(); i++) {
+ if (commonVoList.get(i).getDictValue().contains("外采申请单")) {
+ billsType = commonVoList.get(i).getDictKey();
+ }
+ }
+ }
+ SysUserVo user = sysUserFeign.fetchBySid(userSid).getData();
+ ResultBean> org = sysStaffOrgFeign.getSysStaffOrgListByStaffSid(user.getStaffSid());
+ SysStaffOrgVo sysStaffOrgVo = null;
+ String orgCode = "";
+ String orgSid = "";
+ String orgName = "";
+ if (org.getSuccess() && org.getData() != null && org.getData().size() > 0) {
+ List list = org.getData();
+ sysStaffOrgVo = list.get(0);
+ orgSid = sysStaffOrgVo.getOrgSid();
+ orgName = sysStaffOrgVo.getOrgName();
+ ResultBean resultBean = sysOrganizationFeign.fetchBySid(orgSid);
+ if (resultBean.getSuccess() && resultBean.getData() != null) {
+ SysOrganizationVo sysOrganizationVo = resultBean.getData();
+ orgCode = sysOrganizationVo.getOrgCode();
+ }
+ }
+ String date = DateUtils.dateConvertStr(new Date(), "yyyy-MM-dd");
+ // 流水号
+ int i = selectCountByOrgSid(billsType, date, orgSid);
+ String num = String.format("%04d", i + 1); // 不足4位补0
+ Map map = new HashMap<>();
+ map.put("billNo_Num", billsType + orgCode + date.replaceAll("-","") + num);
+ map.put("billNo", billsType + orgCode + date.replaceAll("-",""));
+ map.put("staffSid", user.getStaffSid());
+ map.put("staffName", user.getName());
+ map.put("orgSid", orgSid);
+ map.put("orgName", orgName);
+ return map;
+ }
+
+ /**
+ * 根据 单据类型编号+部门编码+日期 查询
+ *
+ * @param billsType
+ * @param date
+ * @param orgSid
+ * @return
+ */
+ public int selectCountByOrgSid(String billsType, String date, String orgSid) {
+ return baseMapper.selectCountByOrgSid(billsType, date, orgSid);
+ }
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleMapper.java
new file mode 100644
index 0000000000..eadfafebad
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleMapper.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle;
+
+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 org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui_base(外采车辆列表)
+ * File: BaseOutsourcingApplicationVehicleMapper.java
+ * Class: com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleMapper
+ * Description: 外采申请车辆列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-11 09:25:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseOutsourcingApplicationVehicleMapper extends BaseMapper {
+
+ //@Update("update base_outsourcing_application_vehicle set name=#{msg} where id=#{id}")
+ //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw);
+
+ IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw);
+
+ List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw);
+
+ @Select("select * from base_outsourcing_application_vehicle")
+ List selectListVo();
+
+ @Delete("delete from base_outsourcing_application_vehicle where outAppSid = #{sid}")
+ void deleteByOutAppSid(String sid);
+
+ @Select("select * from base_outsourcing_application_vehicle where outAppSid = #{sid}")
+ List fetchByOutAppSid(String sid);
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleMapper.xml
new file mode 100644
index 0000000000..c2e3a98ed2
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleMapper.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleRest.java
new file mode 100644
index 0000000000..b543033a00
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleRest.java
@@ -0,0 +1,81 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle;
+
+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 java.util.List;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleQuery;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleFeign;
+
+/**
+ * Project: anrui_base(外采车辆列表)
+ * File: BaseOutsourcingApplicationVehicleFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleRest
+ * Description: 外采申请车辆列表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-11 09:25:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "外采申请车辆列表")
+@RestController("com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleRest")
+@RequestMapping("/baseoutsourcingapplicationvehicle")
+public class BaseOutsourcingApplicationVehicleRest implements BaseOutsourcingApplicationVehicleFeign {
+
+ @Autowired
+ private BaseOutsourcingApplicationVehicleService baseOutsourcingApplicationVehicleService;
+
+ @Override
+ @ApiOperation("新增保存")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody BaseOutsourcingApplicationVehicleDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ baseOutsourcingApplicationVehicleService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ baseOutsourcingApplicationVehicleService.delBySids(sids);
+ return rb.success();
+ }
+}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleService.java
new file mode 100644
index 0000000000..0273b57e52
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplicationvehicle/BaseOutsourcingApplicationVehicleService.java
@@ -0,0 +1,128 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.commons.lang3.StringUtils;
+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.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicle;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleQuery;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleVo;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleDto;
+import com.yxt.anrui.base.api.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui_base(外采车辆列表)
+ * File: BaseOutsourcingApplicationVehicleService.java
+ * Class: com.yxt.anrui.base.biz.baseoutsourcingapplicationvehicle.BaseOutsourcingApplicationVehicleService
+ * Description: 外采申请车辆列表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-04-11 09:25:41
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseOutsourcingApplicationVehicleService extends MybatisBaseService {
+ public PagerVo listPage(PagerQuery pq) {
+ BaseOutsourcingApplicationVehicleQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPage(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+ public List listAll(BaseOutsourcingApplicationVehicleQuery query) {
+ QueryWrapper qw = createQueryWrapper(query);
+ return baseMapper.selectList(qw);
+ }
+ private QueryWrapper createQueryWrapper(BaseOutsourcingApplicationVehicleQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+
+
+ if (StringUtils.isNotBlank(query.getOutAppSid())) {
+ qw.eq("outAppSid", query.getOutAppSid());
+ }
+
+ if (StringUtils.isNotBlank(query.getVIN())) {
+ qw.eq("VIN", query.getVIN());
+ }
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ BaseOutsourcingApplicationVehicleQuery query = pq.getParams();
+ QueryWrapper qw = createQueryWrapper(query);
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public List listAllVo(BaseOutsourcingApplicationVehicleQuery query) {
+ QueryWrapper qw = createQueryWrapper(query);
+ return baseMapper.selectListAllVo(qw);
+ }
+
+ public List listVo() {
+ return baseMapper.selectListVo();
+ }
+
+ public void saveOrUpdateDto(BaseOutsourcingApplicationVehicleDto dto){
+ BaseOutsourcingApplicationVehicle entity = new BaseOutsourcingApplicationVehicle();
+ dto.fillEntity(entity);
+ this.saveOrUpdate(entity);
+ }
+
+ public BaseOutsourcingApplicationVehicleVo fetchByIdVo(String id){
+ BaseOutsourcingApplicationVehicle entity = this.fetchById(id);
+ BaseOutsourcingApplicationVehicleVo vo = new BaseOutsourcingApplicationVehicleVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public void deleteByOutAppSid(String sid) {
+ baseMapper.deleteByOutAppSid(sid);
+ }
+
+ public List fetchByOutAppSid(String sid) {
+ return baseMapper.fetchByOutAppSid(sid);
+ }
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
index 320e0b59b6..60d51b38d3 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java
@@ -674,6 +674,12 @@ public class BaseVehicleService extends MybatisBaseService
SELECT bvm.sid, bvb.brandName, bm.manufacturerName, bvm.modelName
FROM base_vehicle_model bvm
- LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
- LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
- ${ew.customSqlSegment}
+ LEFT JOIN base_vehicle_brand bvb ON bvb.sid = bvm.carBrand
+ LEFT JOIN base_manufacturer bm ON bvm.manufacturer = bm.sid
+ ${ew.customSqlSegment}