diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModprice.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModprice.java
new file mode 100644
index 0000000000..2201a0b9f5
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModprice.java
@@ -0,0 +1,148 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+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: BaseModelModprice.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice
+ * Description: 车型调价申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表", description = "车型调价申请表")
+@TableName("base_model_modprice")
+public class BaseModelModprice extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+
+ @ApiModelProperty("申请人姓名")
+ private String applyPeoName; // 申请人姓名
+
+ @ApiModelProperty("调价原因")
+ private String modpriceReason; // 调价原因
+
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+
+ @ApiModelProperty("使用组织名称")
+ private String useOrgName; // 使用组织名称
+
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+
+ @ApiModelProperty("创建组织名称")
+ private String createOrgName; // 创建组织名称
+
+ /**
+ * @return 申请人姓名
+ */
+ public String getApplyPeoName(){
+ return applyPeoName;
+ }
+
+ /**
+ * @param applyPeoName 申请人姓名 to set
+ */
+ public void setApplyPeoName(String applyPeoName){
+ this.applyPeoName = applyPeoName;
+ }
+ /**
+ * @return 调价原因
+ */
+ public String getModpriceReason(){
+ return modpriceReason;
+ }
+
+ /**
+ * @param modpriceReason 调价原因 to set
+ */
+ public void setModpriceReason(String modpriceReason){
+ this.modpriceReason = modpriceReason;
+ }
+ /**
+ * @return 使用组织sid
+ */
+ public String getUseOrgSid(){
+ return useOrgSid;
+ }
+
+ /**
+ * @param useOrgSid 使用组织sid to set
+ */
+ public void setUseOrgSid(String useOrgSid){
+ this.useOrgSid = useOrgSid;
+ }
+ /**
+ * @return 使用组织名称
+ */
+ public String getUseOrgName(){
+ return useOrgName;
+ }
+
+ /**
+ * @param useOrgName 使用组织名称 to set
+ */
+ public void setUseOrgName(String useOrgName){
+ this.useOrgName = useOrgName;
+ }
+ /**
+ * @return 创建组织sid
+ */
+ public String getCreateOrgSid(){
+ return createOrgSid;
+ }
+
+ /**
+ * @param createOrgSid 创建组织sid to set
+ */
+ public void setCreateOrgSid(String createOrgSid){
+ this.createOrgSid = createOrgSid;
+ }
+ /**
+ * @return 创建组织名称
+ */
+ public String getCreateOrgName(){
+ return createOrgName;
+ }
+
+ /**
+ * @param createOrgName 创建组织名称 to set
+ */
+ public void setCreateOrgName(String createOrgName){
+ this.createOrgName = createOrgName;
+ }
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDetailVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDetailVo.java
new file mode 100644
index 0000000000..f6f59905a8
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDetailVo.java
@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceVo.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo
+ * Description: 车型调价申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表 视图数据对象", description = "车型调价申请表 视图数据对象")
+@Data
+public class BaseModelModpriceDetailVo implements Vo {
+
+ @ApiModelProperty("申请日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime; // 申请日期
+ @ApiModelProperty("申请人姓名")
+ private String applyPeoName; // 申请人姓名
+ @ApiModelProperty("调价原因")
+ private String modpriceReason; // 调价原因
+ @ApiModelProperty("调价申请车型列表")
+ private List baseModelModpriceModels; // 调价申请车型列表
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java
new file mode 100644
index 0000000000..88d131abcc
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceDto.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+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: BaseModelModpriceDto.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceDto
+ * Description: 车型调价申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表 数据传输对象", description = "车型调价申请表 数据传输对象")
+@Data
+public class BaseModelModpriceDto implements Dto {
+
+ @ApiModelProperty("sid")
+ private String sid; // sid
+ @ApiModelProperty("申请人姓名")
+ private String applyPeoName; // 申请人姓名
+ @ApiModelProperty("调价原因")
+ private String modpriceReason; // 调价原因
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("调价申请车型列表")
+ private List baseModelModpriceModels; // 调价申请车型列表
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java
new file mode 100644
index 0000000000..d288920ae5
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeign.java
@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+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 javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceFeign.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeign
+ * Description: 车型调价申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请表")
+@FeignClient(
+ contextId = "anrui-base-BaseModelModprice",
+ name = "anrui-base",
+ path = "v1/basemodelmodprice",
+ fallback = BaseModelModpriceFeignFallback.class)
+public interface BaseModelModpriceFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("新增保存")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@Valid @RequestBody BaseModelModpriceDto dto);
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("根据SID获取一条记录")
+ @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/basemodelmodprice/BaseModelModpriceFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java
new file mode 100644
index 0000000000..84a843e1d4
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceFeignFallback.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+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: BaseModelModpriceFeignFallback.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeignFallback
+ * Description: 车型调价申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseModelModpriceFeignFallback implements BaseModelModpriceFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-base/basemodelmodprice/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean saveOrUpdate(BaseModelModpriceDto dto){
+ return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodprice/save无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodprice/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetchBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-base/basemodelmodprice/fetchBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceQuery.java
new file mode 100644
index 0000000000..7eba1c1cbf
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceQuery.java
@@ -0,0 +1,60 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceQuery.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceQuery
+ * Description: 车型调价申请表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表 查询条件", description = "车型调价申请表 查询条件")
+@Data
+public class BaseModelModpriceQuery implements Query {
+
+ @ApiModelProperty("申请开始日期")
+ private String createStartTime; // 申请开始日期
+ @ApiModelProperty("申请结束日期")
+ private String createEndTime; // 申请结束日期
+ @ApiModelProperty("车型别名")
+ private String vehicleAlias; // 车型别名
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceVo.java
new file mode 100644
index 0000000000..6a35ae1c4b
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodprice/BaseModelModpriceVo.java
@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodprice;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceVo.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo
+ * Description: 车型调价申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表 视图数据对象", description = "车型调价申请表 视图数据对象")
+@Data
+public class BaseModelModpriceVo implements Vo {
+
+ @ApiModelProperty("sid")
+ private String sid; // sid
+ @ApiModelProperty("申请日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ private Date createTime; // 申请日期
+ @ApiModelProperty("申请人姓名")
+ private String applyPeoName; // 申请人姓名
+ @ApiModelProperty("车型别名")
+ private String vehicleAlias; // 车型别名
+ @ApiModelProperty("调价原因")
+ private String modpriceReason; // 调价原因
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java
new file mode 100644
index 0000000000..9329d32df6
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModel.java
@@ -0,0 +1,180 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+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: BaseModelModpriceModel.java
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel
+ * Description: 车型调价申请车型表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请车型表", description = "车型调价申请车型表")
+@TableName("base_model_modprice_model")
+public class BaseModelModpriceModel extends BaseEntity {
+ private static final long serialVersionUID = 1L;
+
+
+ @ApiModelProperty("车型调价申请sid")
+ private String mainSid; // 车型调价申请sid
+
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+
+ @ApiModelProperty("车型别名")
+ private String vehicleAlias; // 车型别名
+
+ @ApiModelProperty("常用配置sid")
+ private String configSid; // 常用配置sid
+
+ @ApiModelProperty("常用配置名称")
+ private String configName; // 常用配置名称
+
+ @ApiModelProperty("成本价")
+ private String costPrice; // 成本价
+
+ @ApiModelProperty("现销售指导价")
+ private String guidedPrice; // 现销售指导价
+
+ @ApiModelProperty("价格增减数额")
+ private String incOrDecInPrice; // 价格增减数额
+
+ /**
+ * @return 车型调价申请sid
+ */
+ public String getMainSid(){
+ return mainSid;
+ }
+
+ /**
+ * @param mainSid 车型调价申请sid to set
+ */
+ public void setMainSid(String mainSid){
+ this.mainSid = mainSid;
+ }
+ /**
+ * @return 车型sid
+ */
+ public String getModelSid(){
+ return modelSid;
+ }
+
+ /**
+ * @param modelSid 车型sid to set
+ */
+ public void setModelSid(String modelSid){
+ this.modelSid = modelSid;
+ }
+ /**
+ * @return 车型别名
+ */
+ public String getVehicleAlias(){
+ return vehicleAlias;
+ }
+
+ /**
+ * @param vehicleAlias 车型别名 to set
+ */
+ public void setVehicleAlias(String vehicleAlias){
+ this.vehicleAlias = vehicleAlias;
+ }
+ /**
+ * @return 常用配置sid
+ */
+ public String getConfigSid(){
+ return configSid;
+ }
+
+ /**
+ * @param configSid 常用配置sid to set
+ */
+ public void setConfigSid(String configSid){
+ this.configSid = configSid;
+ }
+ /**
+ * @return 常用配置名称
+ */
+ public String getConfigName(){
+ return configName;
+ }
+
+ /**
+ * @param configName 常用配置名称 to set
+ */
+ public void setConfigName(String configName){
+ this.configName = configName;
+ }
+ /**
+ * @return 成本价
+ */
+ public String getCostPrice(){
+ return costPrice;
+ }
+
+ /**
+ * @param costPrice 成本价 to set
+ */
+ public void setCostPrice(String costPrice){
+ this.costPrice = costPrice;
+ }
+ /**
+ * @return 现销售指导价
+ */
+ public String getGuidedPrice(){
+ return guidedPrice;
+ }
+
+ /**
+ * @param guidedPrice 现销售指导价 to set
+ */
+ public void setGuidedPrice(String guidedPrice){
+ this.guidedPrice = guidedPrice;
+ }
+ /**
+ * @return 价格增减数额
+ */
+ public String getIncOrDecInPrice(){
+ return incOrDecInPrice;
+ }
+
+ /**
+ * @param incOrDecInPrice 价格增减数额 to set
+ */
+ public void setIncOrDecInPrice(String incOrDecInPrice){
+ this.incOrDecInPrice = incOrDecInPrice;
+ }
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java
new file mode 100644
index 0000000000..f5e76d65a8
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelDto.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceModelDto.java
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto
+ * Description: 车型调价申请车型表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请车型表 数据传输对象", description = "车型调价申请车型表 数据传输对象")
+@Data
+public class BaseModelModpriceModelDto implements Dto {
+
+ @ApiModelProperty("车型调价申请sid")
+ private String mainSid; // 车型调价申请sid
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+ @ApiModelProperty("车型别名")
+ private String vehicleAlias; // 车型别名
+ @ApiModelProperty("常用配置sid")
+ private String configSid; // 常用配置sid
+ @ApiModelProperty("常用配置名称")
+ private String configName; // 常用配置名称
+ @ApiModelProperty("成本价")
+ private String costPrice; // 成本价
+ @ApiModelProperty("现销售指导价")
+ private String guidedPrice; // 现销售指导价
+ @ApiModelProperty("价格增减数额")
+ private String incOrDecInPrice; // 价格增减数额
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeign.java
new file mode 100644
index 0000000000..dae1fe96ee
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeign.java
@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+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: BaseModelModpriceModelFeign.java
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeign
+ * Description: 车型调价申请车型表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请车型表")
+@FeignClient(
+ contextId = "anrui-base-BaseModelModpriceModel",
+ name = "anrui-base",
+ path = "basemodelmodpricemodel",
+ fallback = BaseModelModpriceModelFeignFallback.class)
+public interface BaseModelModpriceModelFeign {
+
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq);
+
+ @ApiOperation("根据条件查询所有数据列表")
+ @PostMapping("/listAll")
+ public ResultBean> listAll(@RequestBody BaseModelModpriceModelQuery query);
+
+ @ApiOperation("所有数据列表")
+ @GetMapping("/list")
+ public ResultBean> list();
+
+ @ApiOperation("新增保存")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody BaseModelModpriceModelDto dto);
+
+ @ApiOperation("修改保存")
+ @PostMapping("/update/{sid}")
+ public ResultBean update(@RequestBody BaseModelModpriceModelDto dto, @PathVariable("sid") String sid);
+
+ @ApiOperation("删除记录")
+ @GetMapping("/del/{ids}")
+ public ResultBean del(@PathVariable("ids") String ids);
+
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids);
+
+ @ApiOperation("获取一条记录")
+ @GetMapping("/fetch/{id}")
+ public ResultBean fetch(@PathVariable("id") String id);
+
+ @ApiOperation("根据SID获取一条记录")
+ @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/basemodelmodpricemodel/BaseModelModpriceModelFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeignFallback.java
new file mode 100644
index 0000000000..60dafccbf5
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelFeignFallback.java
@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+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: BaseModelModpriceModelFeignFallback.java
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeignFallback
+ * Description: 车型调价申请车型表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseModelModpriceModelFeignFallback implements BaseModelModpriceModelFeign {
+
+ @Override
+ public ResultBean> listPage(PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-base/basemodelmodpricemodel/listPage无法访问");
+ }
+
+ @Override
+ public ResultBean> listAll(BaseModelModpriceModelQuery query){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-base/basemodelmodpricemodel/listAll无法访问");
+ }
+
+ @Override
+ public ResultBean> list(){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-base/basemodelmodpricemodel/list无法访问");
+ }
+
+ @Override
+ public ResultBean save(BaseModelModpriceModelDto dto){
+ return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodpricemodel/save无法访问");
+ }
+
+ @Override
+ public ResultBean update(BaseModelModpriceModelDto dto, String sid){
+ return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodpricemodel/update无法访问");
+ }
+
+ @Override
+ public ResultBean del(String ids){
+ return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodpricemodel/del无法访问");
+ }
+
+ @Override
+ public ResultBean delBySids( String[] sids){
+ return ResultBean.fireFail().setMsg("接口anrui-base/basemodelmodpricemodel/delBySids无法访问");
+ }
+
+ @Override
+ public ResultBean fetch(String id){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-base/basemodelmodpricemodel/fetch无法访问");
+ }
+
+ @Override
+ public ResultBean fetchBySid(String sid){
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("接口anrui-base/basemodelmodpricemodel/fetchBySid无法访问");
+ }
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelQuery.java
new file mode 100644
index 0000000000..741ba62b67
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelQuery.java
@@ -0,0 +1,187 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceModelQuery.java
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelQuery
+ * Description: 车型调价申请车型表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请车型表 查询条件", description = "车型调价申请车型表 查询条件")
+public class BaseModelModpriceModelQuery implements Query {
+
+
+ @ApiModelProperty("车型调价申请sid")
+ private String mainSid; // 车型调价申请sid
+
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+
+ @ApiModelProperty("车型别名")
+ private String vehicleAlias; // 车型别名
+
+ @ApiModelProperty("常用配置sid")
+ private String configSid; // 常用配置sid
+
+ @ApiModelProperty("常用配置名称")
+ private String configName; // 常用配置名称
+
+ @ApiModelProperty("成本价")
+ private String costPrice; // 成本价
+
+ @ApiModelProperty("现销售指导价")
+ private String guidedPrice; // 现销售指导价
+
+ @ApiModelProperty("价格增减数额")
+ private String incOrDecInPrice; // 价格增减数额
+
+
+ /**
+ * @return 车型调价申请sid
+ */
+ public String getMainSid(){
+ return mainSid;
+ }
+
+ /**
+ * @param mainSid 车型调价申请sid to set
+ */
+ public void setMainSid(String mainSid){
+ this.mainSid = mainSid;
+ }
+
+ /**
+ * @return 车型sid
+ */
+ public String getModelSid(){
+ return modelSid;
+ }
+
+ /**
+ * @param modelSid 车型sid to set
+ */
+ public void setModelSid(String modelSid){
+ this.modelSid = modelSid;
+ }
+
+ /**
+ * @return 车型别名
+ */
+ public String getVehicleAlias(){
+ return vehicleAlias;
+ }
+
+ /**
+ * @param vehicleAlias 车型别名 to set
+ */
+ public void setVehicleAlias(String vehicleAlias){
+ this.vehicleAlias = vehicleAlias;
+ }
+
+ /**
+ * @return 常用配置sid
+ */
+ public String getConfigSid(){
+ return configSid;
+ }
+
+ /**
+ * @param configSid 常用配置sid to set
+ */
+ public void setConfigSid(String configSid){
+ this.configSid = configSid;
+ }
+
+ /**
+ * @return 常用配置名称
+ */
+ public String getConfigName(){
+ return configName;
+ }
+
+ /**
+ * @param configName 常用配置名称 to set
+ */
+ public void setConfigName(String configName){
+ this.configName = configName;
+ }
+
+ /**
+ * @return 成本价
+ */
+ public String getCostPrice(){
+ return costPrice;
+ }
+
+ /**
+ * @param costPrice 成本价 to set
+ */
+ public void setCostPrice(String costPrice){
+ this.costPrice = costPrice;
+ }
+
+ /**
+ * @return 现销售指导价
+ */
+ public String getGuidedPrice(){
+ return guidedPrice;
+ }
+
+ /**
+ * @param guidedPrice 现销售指导价 to set
+ */
+ public void setGuidedPrice(String guidedPrice){
+ this.guidedPrice = guidedPrice;
+ }
+
+ /**
+ * @return 价格增减数额
+ */
+ public String getIncOrDecInPrice(){
+ return incOrDecInPrice;
+ }
+
+ /**
+ * @param incOrDecInPrice 价格增减数额 to set
+ */
+ public void setIncOrDecInPrice(String incOrDecInPrice){
+ this.incOrDecInPrice = incOrDecInPrice;
+ }
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java
new file mode 100644
index 0000000000..decb75ab86
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basemodelmodpricemodel/BaseModelModpriceModelVo.java
@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basemodelmodpricemodel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceModelVo.java
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo
+ * Description: 车型调价申请车型表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请车型表 视图数据对象", description = "车型调价申请车型表 视图数据对象")
+@Data
+public class BaseModelModpriceModelVo implements Vo {
+
+ @ApiModelProperty("车型调价申请sid")
+ private String mainSid; // 车型调价申请sid
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+ @ApiModelProperty("车型别名")
+ private String vehicleAlias; // 车型别名
+ @ApiModelProperty("常用配置sid")
+ private String configSid; // 常用配置sid
+ @ApiModelProperty("常用配置名称")
+ private String configName; // 常用配置名称
+ @ApiModelProperty("成本价")
+ private String costPrice; // 成本价
+ @ApiModelProperty("现销售指导价")
+ private String guidedPrice; // 现销售指导价
+ @ApiModelProperty("价格增减数额")
+ private String incOrDecInPrice; // 价格增减数额
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
index 15ec6eb7cd..25a04553e9 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeign.java
@@ -101,6 +101,15 @@ public interface BaseVehmodelConfigFeign {
@GetMapping("selectOne")
ResultBean selectOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "modelConfigSid") String configSid, @RequestParam(value = "orgSid") String orgSid);
+ /**
+ * 根据分公司sid查询车型和常用配置关联表
+ * 排除已选择的车型与常用配置关联sid并查询其他
+ * @return
+ */
+ @ApiOperation("根据分公司sid查询车型和常用配置关联表")
+ @PostMapping("selVehModelByUseOrgSidAndModelSidAndConfigSid")
+ ResultBean> selVehModelByUseOrgSidAndModelSidAndConfigSid(@RequestBody PagerQuery pq);
+
/***************************************************** App接口 **********************************************************/
@ApiOperation("手机端车型库列表")
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
index e6bafd9fee..df2a8a5060 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigFeignFallback.java
@@ -87,6 +87,11 @@ public class BaseVehmodelConfigFeignFallback implements BaseVehmodelConfigFeign
return null;
}
+ @Override
+ public ResultBean> selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery pq) {
+ return null;
+ }
+
@Override
public ResultBean> getAppCommonlyUsedModelsByPageList(PagerQuery pagerQuery) {
return null;
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java
new file mode 100644
index 0000000000..c69e3ae94c
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigQuerys.java
@@ -0,0 +1,55 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehmodelconfig;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型信息)
+ * File: BaseVehmodelConfigQuery.java
+ * Class: com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigQuery
+ * Description: 车型与简述配置关联表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-01-15 10:51:33
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型与简述配置关联表 查询条件", description = "车型与简述配置关联表 查询条件")
+@Data
+public class BaseVehmodelConfigQuerys implements Query {
+
+ @ApiModelProperty(value = "分公司sid")
+ private String useOrgSid;
+ @ApiModelProperty(value = "车型配置和常用配置")
+ private String[] sidList;
+}
diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java
new file mode 100644
index 0000000000..7eb18d357e
--- /dev/null
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehmodelconfig/BaseVehmodelConfigVos.java
@@ -0,0 +1,27 @@
+package com.yxt.anrui.base.api.basevehmodelconfig;
+
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/4/29 10:59
+ * @Description
+ */
+@Data
+public class BaseVehmodelConfigVos implements Vo {
+ @ApiModelProperty(value = "销售指导价")
+ @JsonSerialize(using = ToStringSerializer.class)
+ private String guidedPrice;
+ @ApiModelProperty(value = "车型别名")
+ private String vehicleAlias;
+ @ApiModelProperty(value = "车型sid")
+ private String modelSid;
+ @ApiModelProperty(value = "常用配置名称")
+ private String configName;
+ @ApiModelProperty(value = "常用配置sid")
+ private String configSid;
+}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.java
new file mode 100644
index 0000000000..684851179e
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.java
@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodprice;
+
+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.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice;
+import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceMapper.java
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceMapper
+ * Description: 车型调价申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseModelModpriceMapper extends BaseMapper {
+
+ //@Update("update base_model_modprice 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_model_modprice")
+ List selectListVo();
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml
new file mode 100644
index 0000000000..b62790285a
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.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/basemodelmodprice/BaseModelModpriceRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java
new file mode 100644
index 0000000000..a21c1a4b57
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceRest.java
@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodprice;
+
+import com.yxt.anrui.base.api.basemodelmodprice.*;
+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: BaseModelModpriceFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceRest
+ * Description: 车型调价申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请表")
+@RestController("com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceRest")
+@RequestMapping("v1/basemodelmodprice")
+public class BaseModelModpriceRest implements BaseModelModpriceFeign {
+
+ @Autowired
+ private BaseModelModpriceService baseModelModpriceService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = baseModelModpriceService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("新增修改保存")
+ @PostMapping("/saveOrUpdate")
+ public ResultBean saveOrUpdate(@RequestBody BaseModelModpriceDto dto){
+ return baseModelModpriceService.saveOrUpdateAll(dto);
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ return baseModelModpriceService.delAll(sids);
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchBySid/{sid}")
+ public ResultBean fetchBySid(@PathVariable("sid") String sid){
+ return baseModelModpriceService.fetchAll(sid);
+ }
+}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
new file mode 100644
index 0000000000..49adccd98b
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceService.java
@@ -0,0 +1,137 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodprice;
+
+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.basemodelmodprice.*;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService;
+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.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceService.java
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceService
+ * Description: 车型调价申请表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseModelModpriceService extends MybatisBaseService {
+
+ @Autowired
+ private BaseModelModpriceModelService baseModelModpriceModelService;
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ BaseModelModpriceQuery query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ String createStartTime = query.getCreateStartTime();
+ String createEndTime = query.getCreateEndTime();
+ qw.apply(StringUtils.isNotEmpty(createStartTime), "date_format (bmm.createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
+ apply(StringUtils.isNotEmpty(createEndTime), "date_format (bmm.createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
+ );
+ qw.eq("bmm.createOrgSid", query.getCreateOrgSid());
+ qw.eq("bmm.isDelete", 0);
+ if (StringUtils.isNotBlank(query.getVehicleAlias())) {
+ qw.like("bmmm.vehicleAlias", query.getVehicleAlias());
+ }
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selectPageVo(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
+
+ public ResultBean saveOrUpdateAll(BaseModelModpriceDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ String sid = dto.getSid();
+ List baseModelModpriceModels = dto.getBaseModelModpriceModels();
+ if (StringUtils.isBlank(sid)){//新增
+ BaseModelModprice baseModelModprice = new BaseModelModprice();
+ String sid1 = baseModelModprice.getSid();
+ BeanUtil.copyProperties(dto, baseModelModprice);
+ baseModelModprice.setSid(sid1);
+ save(baseModelModprice);
+ for (BaseModelModpriceModelDto modelModpriceModel : baseModelModpriceModels) {
+ BaseModelModpriceModel baseModelModpriceModel = new BaseModelModpriceModel();
+ BeanUtil.copyProperties(modelModpriceModel, baseModelModpriceModel);
+ baseModelModpriceModel.setMainSid(sid1);
+ baseModelModpriceModelService.save(baseModelModpriceModel);
+ }
+ return rb.success().setMsg("保存成功");
+ }
+ BaseModelModprice baseModelModprice = fetchBySid(sid);
+ if (baseModelModprice == null){
+ return rb.setMsg("该车型调价单不存在");
+ }
+ updateBySid(dto.toMap(), sid);
+ baseModelModpriceModelService.delByMainSid(sid);
+ for (BaseModelModpriceModelDto modelModpriceModel : baseModelModpriceModels) {
+ BaseModelModpriceModel baseModelModpriceModel = new BaseModelModpriceModel();
+ BeanUtil.copyProperties(modelModpriceModel, baseModelModpriceModel);
+ baseModelModpriceModel.setMainSid(sid);
+ baseModelModpriceModelService.save(baseModelModpriceModel);
+ }
+ return rb.success().setMsg("修改成功");
+ }
+
+ public ResultBean fetchAll(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ BaseModelModpriceDetailVo baseModelModpriceDetailVo = new BaseModelModpriceDetailVo();
+ BaseModelModprice baseModelModprice = fetchBySid(sid);
+ BeanUtil.copyProperties(baseModelModprice, baseModelModpriceDetailVo);
+ List baseModelModpriceModelVos = baseModelModpriceModelService.fetchByMainSid(sid);
+ baseModelModpriceDetailVo.setBaseModelModpriceModels(baseModelModpriceModelVos);
+ return rb.success().setData(baseModelModpriceDetailVo);
+ }
+
+ public ResultBean delAll(String[] sids) {
+ ResultBean rb = ResultBean.fireFail();
+ delBySids(sids);
+ for (String sid : sids) {
+ baseModelModpriceModelService.delByMainSid(sid);
+ }
+ return rb.success().setMsg("删除成功");
+ }
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.java
new file mode 100644
index 0000000000..8f7d929cf3
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.java
@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodpricemodel;
+
+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.basemodelmodpricemodel.BaseModelModpriceModel;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceModelMapper.java
+ * Class: com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelMapper
+ * Description: 车型调价申请车型表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseModelModpriceModelMapper extends BaseMapper {
+
+ //@Update("update base_model_modprice_model 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_model_modprice_model")
+ List selectListVo();
+
+ @Select("select * from base_model_modprice_model where mainSid = #{sid}")
+ List fetchByMainSid(String sid);
+
+ @Delete("delete from base_model_modprice_model where mainSid = #{sid}")
+ int delByMainSid(String sid);
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml
new file mode 100644
index 0000000000..9ef55caed6
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.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/basemodelmodpricemodel/BaseModelModpriceModelRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelRest.java
new file mode 100644
index 0000000000..b899b957e6
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelRest.java
@@ -0,0 +1,144 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodpricemodel;
+
+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.basemodelmodpricemodel.BaseModelModpriceModel;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelQuery;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeign;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceModelFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelRest
+ * Description: 车型调价申请车型表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请车型表")
+@RestController("com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelRest")
+@RequestMapping("/basemodelmodpricemodel")
+public class BaseModelModpriceModelRest implements BaseModelModpriceModelFeign {
+
+ @Autowired
+ private BaseModelModpriceModelService baseModelModpriceModelService;
+
+ @Override
+ @ApiOperation("根据条件分页查询数据的列表")
+ @PostMapping("/listPage")
+ public ResultBean> listPage(@RequestBody PagerQuery pq){
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = baseModelModpriceModelService.listPageVo(pq);
+ return rb.success().setData(pv);
+ }
+
+ @Override
+ @ApiOperation("根据条件查询所有数据列表")
+ @PostMapping("/listAll")
+ public ResultBean> listAll(@RequestBody BaseModelModpriceModelQuery query){
+ ResultBean rb = ResultBean.fireFail();
+ List list = baseModelModpriceModelService.listAllVo(query);
+ return rb.success().setData(list);
+ }
+
+ @Override
+ @ApiOperation("所有数据列表")
+ @GetMapping("/list")
+ public ResultBean> list(){
+ ResultBean rb = ResultBean.fireFail();
+ List list = baseModelModpriceModelService.listVo();
+ return rb.success().setData(list);
+ }
+
+ @Override
+ @ApiOperation("新增保存")
+ @PostMapping("/save")
+ public ResultBean save(@RequestBody BaseModelModpriceModelDto dto){
+ ResultBean rb = ResultBean.fireFail();
+ baseModelModpriceModelService.saveOrUpdateDto(dto);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("修改保存")
+ @PostMapping("/update/{sid}")
+ public ResultBean update(@RequestBody BaseModelModpriceModelDto dto, @PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ baseModelModpriceModelService.updateBySid(dto.toMap(),sid);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("删除记录")
+ @GetMapping("/del/{ids}")
+ public ResultBean del(@PathVariable("ids") String ids){
+ ResultBean rb = ResultBean.fireFail();
+ baseModelModpriceModelService.delByIds(ids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("根据sid批量删除")
+ @PostMapping("/delBySids")
+ public ResultBean delBySids(@RequestBody String[] sids){
+ ResultBean rb = ResultBean.fireFail();
+ baseModelModpriceModelService.delBySids(sids);
+ return rb.success();
+ }
+
+ @Override
+ @ApiOperation("获取一条记录")
+ @GetMapping("/fetch/{id}")
+ public ResultBean fetch(@PathVariable("id") String id){
+ ResultBean rb = ResultBean.fireFail();
+ BaseModelModpriceModelVo vo = baseModelModpriceModelService.fetchByIdVo(id);
+ return rb.success().setData(vo);
+ }
+
+ @Override
+ @ApiOperation("根据SID获取一条记录")
+ @GetMapping("/fetchBySid/{sid}")
+ public ResultBean fetchBySid(@PathVariable("sid") String sid){
+ ResultBean rb = ResultBean.fireFail();
+ BaseModelModpriceModelVo vo = null;
+ return rb.success().setData(vo);
+ }
+}
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelService.java
new file mode 100644
index 0000000000..741fc27fd8
--- /dev/null
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelService.java
@@ -0,0 +1,152 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basemodelmodpricemodel;
+
+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.basemodelmodpricemodel.BaseModelModpriceModel;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelQuery;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceModelService.java
+ * Class: com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService
+ * Description: 车型调价申请车型表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseModelModpriceModelService extends MybatisBaseService {
+ public PagerVo listPage(PagerQuery pq) {
+ BaseModelModpriceModelQuery 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(BaseModelModpriceModelQuery query) {
+ QueryWrapper qw = createQueryWrapper(query);
+ return baseMapper.selectList(qw);
+ }
+ private QueryWrapper createQueryWrapper(BaseModelModpriceModelQuery query) {
+ // todo: 这里根据具体业务调整查询条件
+ // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+ QueryWrapper qw = new QueryWrapper<>();
+
+
+ if (StringUtils.isNotBlank(query.getMainSid())) {
+ qw.eq("mainSid", query.getMainSid());
+ }
+
+ if (StringUtils.isNotBlank(query.getModelSid())) {
+ qw.eq("modelSid", query.getModelSid());
+ }
+
+ if (StringUtils.isNotBlank(query.getVehicleAlias())) {
+ qw.eq("vehicleAlias", query.getVehicleAlias());
+ }
+
+ if (StringUtils.isNotBlank(query.getConfigSid())) {
+ qw.eq("configSid", query.getConfigSid());
+ }
+
+ if (StringUtils.isNotBlank(query.getConfigName())) {
+ qw.eq("configName", query.getConfigName());
+ }
+
+ if (StringUtils.isNotBlank(query.getCostPrice())) {
+ qw.eq("costPrice", query.getCostPrice());
+ }
+
+ if (StringUtils.isNotBlank(query.getGuidedPrice())) {
+ qw.eq("guidedPrice", query.getGuidedPrice());
+ }
+
+ if (StringUtils.isNotBlank(query.getIncOrDecInPrice())) {
+ qw.eq("incOrDecInPrice", query.getIncOrDecInPrice());
+ }
+ return qw;
+ }
+
+ public PagerVo listPageVo(PagerQuery pq) {
+ BaseModelModpriceModelQuery 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(BaseModelModpriceModelQuery query) {
+ QueryWrapper qw = createQueryWrapper(query);
+ return baseMapper.selectListAllVo(qw);
+ }
+
+ public List listVo() {
+ return baseMapper.selectListVo();
+ }
+
+ public void saveOrUpdateDto(BaseModelModpriceModelDto dto){
+ BaseModelModpriceModel entity = new BaseModelModpriceModel();
+ dto.fillEntity(entity);
+ this.saveOrUpdate(entity);
+ }
+
+ public BaseModelModpriceModelVo fetchByIdVo(String id){
+ BaseModelModpriceModel entity = this.fetchById(id);
+ BaseModelModpriceModelVo vo = new BaseModelModpriceModelVo();
+ BeanUtil.copyProperties(entity, vo);
+ return vo;
+ }
+
+ public List fetchByMainSid(String sid) {
+ return baseMapper.fetchByMainSid(sid);
+ }
+
+ public int delByMainSid(String sid) {
+ return baseMapper.delByMainSid(sid);
+ }
+}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
index 50addfb761..09bc350d0a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.java
@@ -130,4 +130,6 @@ public interface BaseVehmodelConfigMapper extends BaseMapper
int checkByModelSid(String sid);
List getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid, @Param("createOrgSId") String createOrgSId);
+
+ IPage selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw);
}
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
index 3937fd0a1a..0142c59385 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigMapper.xml
@@ -5,9 +5,9 @@
@@ -191,8 +191,8 @@
bvm.carBrand AS brandSid,
bvc.guidedPrice AS saleReferencePrice
FROM base_vehmodel_config bvc
- 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_vehicle_model bvm ON bvc.modelSid = bvm.sid
+ LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrg}
@@ -205,16 +205,16 @@
bvc.`manufactorSettlementPrice`,
bvc.`guidedPrice`
FROM base_vehmodel_config bvc
- 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_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+ LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
WHERE bvc.sid = #{sid}
select bvc.guidedPrice, bm.modelName, bmc.otherConfig, bm.carBrand as brandSid
from base_vehmodel_config bvc
- left join base_vehicle_model bm on bvc.modelSid = bm.sid
- left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
+ left join base_vehicle_model bm on bvc.modelSid = bm.sid
+ left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
where bvc.modelSid = #{modelSid}
and bvc.configurationItemsSid = #{configSid}
and bvc.useOrgSid = #{orgSid}
@@ -248,8 +248,8 @@
bvc.guidedPrice as price,
bmc.otherConfig
FROM base_vehmodel_config bvc
- LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.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_vehicle_model bvm ON bvc.modelSid = bvm.sid
WHERE bvc.modelSid = #{modelSid}
AND bvc.configurationItemsSid = #{configSid}
AND bvc.useOrgSid = #{useOrgSid}
@@ -289,4 +289,25 @@
WHERE configurationItemsSid = #{configSid}
AND useOrgSid = #{createOrgSId}
+
+
+ SELECT
+ bvm.`vehicleAlias`,
+ bvm.sid as modelSid,
+ bmc.`configName`,
+ bmc.sid as configSid,
+ bvc.`guidedPrice`
+ FROM
+ base_vehmodel_config bvc
+ 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_vehicle bv
+ ON bvc.`modelSid` = bv.`modelSid`
+
+ ${ew.sqlSegment}
+
+
\ No newline at end of file
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
index f82a2d502e..cb5cfb462a 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigRest.java
@@ -119,6 +119,13 @@ public class BaseVehmodelConfigRest implements BaseVehmodelConfigFeign {
return baseVehmodelConfigService.selectOne(modelSid, configSid,orgSid);
}
+ @Override
+ public ResultBean> selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery pq) {
+ ResultBean rb = ResultBean.fireFail();
+ PagerVo pv = baseVehmodelConfigService.selVehModelByUseOrgSidAndModelSidAndConfigSid(pq);
+ return rb.success().setData(pv);
+ }
+
/**
* 手机端车型库列表
*
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
index eb2658a6c7..7240e6bacd 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehmodelconfig/BaseVehmodelConfigService.java
@@ -48,6 +48,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -568,4 +569,21 @@ public class BaseVehmodelConfigService extends MybatisBaseService getListByConfigSidAndUseOrgSid(String configSid, String createOrgSId) {
return baseMapper.getListByConfigSidAndUseOrgSid(configSid, createOrgSId);
}
+
+ public PagerVo selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery pq) {
+ BaseVehmodelConfigQuerys query = pq.getParams();
+ QueryWrapper qw = new QueryWrapper<>();
+ qw.eq("bvc.useOrgSid",query.getUseOrgSid());
+ qw.eq("bv.createOrg",query.getUseOrgSid());
+ qw.eq("bv.vehicleStateValue","库存");
+ String[] sidList = query.getSidList();
+ if (sidList.length > 0){
+ List stringList = Arrays.asList(sidList);
+ qw.ne("bvc.modelSid",stringList.get(0)).ne("bvc.configurationItemsSid",stringList.get(1));
+ }
+ IPage page = PagerUtil.queryToPage(pq);
+ IPage pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw);
+ PagerVo p = PagerUtil.pageToVo(pagging, null);
+ return p;
+ }
}
\ No newline at end of file
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java
index 05caff4cb7..e8365430ca 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenu/SysMenuRest.java
@@ -97,7 +97,8 @@ public class SysMenuRest implements SysMenuFeign {
Integer type = sysRoleService.fetchBySid(roleSid).getType();
if (type == 1){
orgRoleMenuQuery.setIsAdmin("1");
- break;
+ }else {
+ orgRoleMenuQuery.setIsAdmin("0");
}
}
orgRoleMenuQuery.setRoleSids(roleSids);
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java
index 9de954cfc9..1f0936a457 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysmenurole/SysMenuRoleService.java
@@ -131,8 +131,10 @@ public class SysMenuRoleService extends MybatisBaseService 0) {
diff --git a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
index c11f054c20..46b7d6c0db 100644
--- a/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
+++ b/anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/sysstaffinfo/SysStaffinfoService.java
@@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.portal.api.sysorganization.AppContactSysOrganizationVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
+import com.yxt.anrui.portal.api.sysrole.SysRole;
+import com.yxt.anrui.portal.api.sysrole.SysRoleVo;
import com.yxt.anrui.portal.api.sysstaffinfo.*;
import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffQuery;
import com.yxt.anrui.portal.api.sysstaffinfo.app.AppSysStaffVo;
@@ -15,11 +17,14 @@ import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPost;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDetailsVo;
import com.yxt.anrui.portal.api.sysstaffpost.SysStaffPostDto;
import com.yxt.anrui.portal.api.sysuser.SysUser;
+import com.yxt.anrui.portal.api.sysuserrole.SysUserRole;
import com.yxt.anrui.portal.biz.sysorganization.SysOrganizationService;
import com.yxt.anrui.portal.biz.syspost.SysPostService;
+import com.yxt.anrui.portal.biz.sysrole.SysRoleService;
import com.yxt.anrui.portal.biz.sysstafforg.SysStaffOrgService;
import com.yxt.anrui.portal.biz.sysstaffpost.SysStaffPostService;
import com.yxt.anrui.portal.biz.sysuser.SysUserService;
+import com.yxt.anrui.portal.biz.sysuserrole.SysUserRoleService;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.Encodes;
@@ -64,6 +69,10 @@ public class SysStaffinfoService extends MybatisBaseService selectAppContactsList() {
List list = baseMapper.selectAppContactsList();
@@ -200,6 +209,10 @@ public class SysStaffinfoService extends MybatisBaseService