车型调价管理接口开发

员工问题修改，默认新建员工角色为试用期员工

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(车型调价申请) <br/>
+ * File: BaseModelModprice.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModprice <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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;
+	}
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo <br/>
+ * Description: 车型调价申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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<BaseModelModpriceModelVo> baseModelModpriceModels; // 调价申请车型列表
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceDto <br/>
+ * Description: 车型调价申请表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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<BaseModelModpriceModelDto> baseModelModpriceModels; // 调价申请车型列表
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeign <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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<PagerVo<BaseModelModpriceVo>> listPage(@RequestBody PagerQuery<BaseModelModpriceQuery> 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<BaseModelModpriceDetailVo> fetchBySid(@PathVariable("sid") String sid);
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeignFallback <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseModelModpriceFeignFallback implements BaseModelModpriceFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseModelModpriceVo>> listPage(PagerQuery<BaseModelModpriceQuery> 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<BaseModelModpriceDetailVo> fetchBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodprice/fetchBySid无法访问");
+	}
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceQuery <br/>
+ * Description: 车型调价申请表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo <br/>
+ * Description: 车型调价申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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; // 调价原因
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceModel.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModel <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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;
+	}
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceModelDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto <br/>
+ * Description: 车型调价申请车型表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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; // 备注
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceModelFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeign <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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<PagerVo<BaseModelModpriceModelVo>> listPage(@RequestBody PagerQuery<BaseModelModpriceModelQuery> pq);
+
+    @ApiOperation("根据条件查询所有数据列表")
+    @PostMapping("/listAll")
+    public ResultBean<List<BaseModelModpriceModelVo>> listAll(@RequestBody BaseModelModpriceModelQuery query);
+
+    @ApiOperation("所有数据列表")
+    @GetMapping("/list")
+    public ResultBean<List<BaseModelModpriceModelVo>> 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<BaseModelModpriceModelVo> fetch(@PathVariable("id") String id);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchBySid/{sid}")
+    public ResultBean<BaseModelModpriceModelVo> fetchBySid(@PathVariable("sid") String sid);
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceModelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelFeignFallback <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseModelModpriceModelFeignFallback implements BaseModelModpriceModelFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseModelModpriceModelVo>> listPage(PagerQuery<BaseModelModpriceModelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodpricemodel/listPage无法访问");
+	}
+
+    @Override
+    public ResultBean<List<BaseModelModpriceModelVo>> listAll(BaseModelModpriceModelQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodpricemodel/listAll无法访问");
+	}
+
+	@Override
+	public ResultBean<List<BaseModelModpriceModelVo>> 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<BaseModelModpriceModelVo> fetch(String id){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodpricemodel/fetch无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseModelModpriceModelVo> fetchBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basemodelmodpricemodel/fetchBySid无法访问");
+	}
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceModelQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelQuery <br/>
+ * Description: 车型调价申请车型表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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;
+	}
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceModelVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo <br/>
+ * Description: 车型调价申请车型表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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; // 备注
+}

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<BaseVehmodelVo> selectOne(@RequestParam(value = "modelSid") String modelSid, @RequestParam(value = "modelConfigSid") String configSid, @RequestParam(value = "orgSid") String orgSid);
 
+    /**
+     * 根据分公司sid查询车型和常用配置关联表
+     * 排除已选择的车型与常用配置关联sid并查询其他
+     * @return
+     */
+    @ApiOperation("根据分公司sid查询车型和常用配置关联表")
+    @PostMapping("selVehModelByUseOrgSidAndModelSidAndConfigSid")
+    ResultBean<PagerVo<BaseVehmodelConfigVos>> selVehModelByUseOrgSidAndModelSidAndConfigSid(@RequestBody PagerQuery<BaseVehmodelConfigQuerys> pq);
+
     /***************************************************** App接口 **********************************************************/
 
     @ApiOperation("手机端车型库列表")

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<PagerVo<BaseVehmodelConfigVos>> selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery<BaseVehmodelConfigQuerys> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean<PagerVo<AppCommonlyUsedModelsByPageListVo>> getAppCommonlyUsedModelsByPageList(PagerQuery<AppCommonlyUsedModelsByPageListQuery> pagerQuery) {
         return null;

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(车型信息) <br/>
+ * File: BaseVehmodelConfigQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigQuery <br/>
+ * Description: 车型与简述配置关联表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-01-15 10:51:33 <br/>
+ *
+ * @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;
+}

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;
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceMapper <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseModelModpriceMapper extends BaseMapper<BaseModelModprice> {
+
+	//@Update("update base_model_modprice set name=#{msg} where id=#{id}")
+	//IPage<BaseModelModpriceVo> voPage(IPage<BaseModelModprice> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelModprice> qw);
+	
+	IPage<BaseModelModpriceVo> selectPageVo(IPage<BaseModelModprice> page, @Param(Constants.WRAPPER) Wrapper<BaseModelModprice> qw);
+	
+	List<BaseModelModpriceVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseModelModprice> qw);
+	
+	@Select("select * from base_model_modprice")
+	List<BaseModelModpriceVo> selectListVo();
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodprice/BaseModelModpriceMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo">
+		SELECT
+		bmm.sid,
+		bmm.createTime,
+		bmm.applyPeoName,
+		bmmm.`vehicleAlias`,
+		bmm.`modpriceReason`
+		FROM
+		base_model_modprice bmm
+		LEFT JOIN base_model_modprice_model bmmm
+		ON bmm.`sid` = bmmm.`mainSid`  <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceVo">
+		SELECT * FROM base_model_modprice <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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(车型调价申请) <br/>
+ * File: BaseModelModpriceFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceRest <br/>
+ * Description: 车型调价申请表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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<PagerVo<BaseModelModpriceVo>> listPage(@RequestBody PagerQuery<BaseModelModpriceQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseModelModpriceVo> 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<BaseModelModpriceDetailVo> fetchBySid(@PathVariable("sid") String sid){
+		return baseModelModpriceService.fetchAll(sid);
+	}
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceService <br/>
+ * Description: 车型调价申请表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseModelModpriceService extends MybatisBaseService<BaseModelModpriceMapper, BaseModelModprice> {
+
+    @Autowired
+    private BaseModelModpriceModelService baseModelModpriceModelService;
+
+    public PagerVo<BaseModelModpriceVo> listPageVo(PagerQuery<BaseModelModpriceQuery> pq) {
+        BaseModelModpriceQuery query = pq.getParams();
+        QueryWrapper<BaseModelModprice> 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<BaseModelModprice> page = PagerUtil.queryToPage(pq);
+        IPage<BaseModelModpriceVo> pagging = baseMapper.selectPageVo(page, qw);
+        PagerVo<BaseModelModpriceVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateAll(BaseModelModpriceDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String sid = dto.getSid();
+        List<BaseModelModpriceModelDto> 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<BaseModelModpriceDetailVo> fetchAll(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseModelModpriceDetailVo baseModelModpriceDetailVo = new BaseModelModpriceDetailVo();
+        BaseModelModprice baseModelModprice = fetchBySid(sid);
+        BeanUtil.copyProperties(baseModelModprice, baseModelModpriceDetailVo);
+        List<BaseModelModpriceModelVo> 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("删除成功");
+    }
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceModelMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelMapper <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseModelModpriceModelMapper extends BaseMapper<BaseModelModpriceModel> {
+
+	//@Update("update base_model_modprice_model set name=#{msg} where id=#{id}")
+	//IPage<BaseModelModpriceModelVo> voPage(IPage<BaseModelModpriceModel> page, @Param(Constants.WRAPPER) QueryWrapper<BaseModelModpriceModel> qw);
+	
+	IPage<BaseModelModpriceModelVo> selectPageVo(IPage<BaseModelModpriceModel> page, @Param(Constants.WRAPPER) Wrapper<BaseModelModpriceModel> qw);
+	
+	List<BaseModelModpriceModelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseModelModpriceModel> qw);
+	
+	@Select("select * from base_model_modprice_model")
+	List<BaseModelModpriceModelVo> selectListVo();
+
+	@Select("select * from base_model_modprice_model where mainSid = #{sid}")
+    List<BaseModelModpriceModelVo> fetchByMainSid(String sid);
+
+	@Delete("delete from base_model_modprice_model where mainSid = #{sid}")
+	int delByMainSid(String sid);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basemodelmodpricemodel/BaseModelModpriceModelMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo">
+		SELECT * FROM base_model_modprice_model <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo">
+		SELECT * FROM base_model_modprice_model <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

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(车型调价申请) <br/>
+ * File: BaseModelModpriceModelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelRest <br/>
+ * Description: 车型调价申请车型表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @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<PagerVo<BaseModelModpriceModelVo>> listPage(@RequestBody PagerQuery<BaseModelModpriceModelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseModelModpriceModelVo> pv = baseModelModpriceModelService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("根据条件查询所有数据列表")
+	@PostMapping("/listAll")
+	public ResultBean<List<BaseModelModpriceModelVo>> listAll(@RequestBody BaseModelModpriceModelQuery query){
+		ResultBean rb = ResultBean.fireFail();
+		List<BaseModelModpriceModelVo> list = baseModelModpriceModelService.listAllVo(query);
+		return rb.success().setData(list);
+	}
+
+	@Override
+	@ApiOperation("所有数据列表")
+	@GetMapping("/list")
+	public ResultBean<List<BaseModelModpriceModelVo>> list(){
+		ResultBean rb = ResultBean.fireFail();
+		List<BaseModelModpriceModelVo> 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<BaseModelModpriceModelVo> 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<BaseModelModpriceModelVo> fetchBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseModelModpriceModelVo vo = null;
+		return rb.success().setData(vo);
+	}
+}

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(车型调价申请) <br/>
+ * File: BaseModelModpriceModelService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basemodelmodpricemodel.BaseModelModpriceModelService <br/>
+ * Description: 车型调价申请车型表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-06-15 09:11:09 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseModelModpriceModelService extends MybatisBaseService<BaseModelModpriceModelMapper, BaseModelModpriceModel> {
+	public PagerVo<BaseModelModpriceModel> listPage(PagerQuery<BaseModelModpriceModelQuery> pq) {
+		BaseModelModpriceModelQuery query = pq.getParams();
+		QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
+		IPage<BaseModelModpriceModel> page = PagerUtil.queryToPage(pq);
+		IPage<BaseModelModpriceModel> pagging = baseMapper.selectPage(page, qw);
+		PagerVo<BaseModelModpriceModel> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	public List<BaseModelModpriceModel> listAll(BaseModelModpriceModelQuery query) {
+		QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
+		return baseMapper.selectList(qw);
+	}
+	private QueryWrapper<BaseModelModpriceModel> createQueryWrapper(BaseModelModpriceModelQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseModelModpriceModel> 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<BaseModelModpriceModelVo> listPageVo(PagerQuery<BaseModelModpriceModelQuery> pq) {
+		BaseModelModpriceModelQuery query = pq.getParams();
+		QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
+		IPage<BaseModelModpriceModel> page = PagerUtil.queryToPage(pq);
+		IPage<BaseModelModpriceModelVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseModelModpriceModelVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public List<BaseModelModpriceModelVo> listAllVo(BaseModelModpriceModelQuery query) {
+		QueryWrapper<BaseModelModpriceModel> qw = createQueryWrapper(query);
+		return baseMapper.selectListAllVo(qw);
+	}
+	
+	public List<BaseModelModpriceModelVo> 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<BaseModelModpriceModelVo> fetchByMainSid(String sid) {
+		return baseMapper.fetchByMainSid(sid);
+    }
+
+	public int delByMainSid(String sid) {
+		return baseMapper.delByMainSid(sid);
+	}
+}

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<BaseVehmodelConfig>
     int checkByModelSid(String sid);
 
     List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(@Param("configSid") String configSid, @Param("createOrgSId") String createOrgSId);
+
+    IPage<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(IPage<BaseVehmodelConfig> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehmodelConfigVos> qw);
 }

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

@@ -5,9 +5,9 @@
     <!--    ${ew.customSqlSegment} -->
     <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVo">
         SELECT bvc.*,
-               bvm.modelName,
+        bvm.modelName,
-               bvm.`vehicleVersionValue`,
+        bvm.`vehicleVersionValue`,
-               bvm.`vehicleTypeCode`,
+        bvm.`vehicleTypeCode`,
         <!--车身颜色-->
         bmc.carColor,
         <!--驾驶室规格-->
@@ -53,10 +53,10 @@
         bmc.configName,
         bvm.insideCode
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm
+        LEFT JOIN base_vehicle_model bvm
-                           ON bvc.modelSid = bvm.sid
+        ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc
+        LEFT JOIN base_model_config bmc
-                           ON bvc.configurationItemsSid = bmc.sid
+        ON bvc.configurationItemsSid = bmc.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -73,14 +73,14 @@
     <select id="getAppCommonlyUsedModelsByPageList"
             resultType="com.yxt.anrui.base.api.basevehmodelconfig.AppCommonlyUsedModelsByPageListVo">
         SELECT bvm.sid AS modelSid,
-               bvm.vehicleAlias,
+        bvm.vehicleAlias,
-               bvm.brandName,
+        bvm.brandName,
-               bvm.vehicleVersionValue,
+        bvm.vehicleVersionValue,
-               bvm.fuelTypeValue,
+        bvm.fuelTypeValue,
-               bvm.gearboxTypeValue
+        bvm.gearboxTypeValue
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+        LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+        LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         <where>
             ${ew.sqlSegment}
         </where>
@@ -109,8 +109,8 @@
                bmc.brandName,
                bvc.guidedPrice
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
+                     LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvm.sid = #{modelSid}
         GROUP BY bvm.sid
     </select>
@@ -126,7 +126,7 @@
     <select id="getConfigNumByModelSid" resultType="java.lang.String">
         SELECT count(*)
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
     </select>
 
@@ -170,8 +170,8 @@
                bmc.configuringBao,
                bmc.otherConfig
         FROM base_vehmodel_config bvc
-                 LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
+                     LEFT JOIN base_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.`sid`
         WHERE bvm.sid = #{modelSid}
           AND bmc.sid = #{configSid}
     </select>
@@ -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_vehicle_model bvm ON bvc.modelSid = bvm.sid
-                 LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
+                     LEFT JOIN base_model_config bmc ON bvc.configurationItemsSid = bmc.sid
         WHERE bvc.modelSid = #{modelSid}
           AND bvc.configurationItemsSid = #{configSid}
           AND bvc.useOrgSid = #{useOrg}
@@ -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_vehicle_model bvm ON bvc.`modelSid` = bvm.`sid`
-                 LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
+                     LEFT JOIN base_model_config bmc ON bvc.`configurationItemsSid` = bmc.`sid`
         WHERE bvc.sid = #{sid}
     </select>
 
     <select id="selectO" resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelVo">
         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_vehicle_model bm on bvc.modelSid = bm.sid
-                 left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
+                     left join base_model_config bmc on bvc.configurationItemsSid = bmc.sid
         where bvc.modelSid = #{modelSid}
           and bvc.configurationItemsSid = #{configSid}
           and bvc.useOrgSid = #{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_model_config bmc ON bvc.configurationItemsSid = bmc.sid
-                 LEFT JOIN base_vehicle_model bvm ON bvc.modelSid = bvm.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>
+
+    <select id="selVehModelByUseOrgSidAndModelSidAndConfigSid"
+            resultType="com.yxt.anrui.base.api.basevehmodelconfig.BaseVehmodelConfigVos">
+        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`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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<PagerVo<BaseVehmodelConfigVos>> selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery<BaseVehmodelConfigQuerys> pq) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<BaseVehmodelConfigVos> pv = baseVehmodelConfigService.selVehModelByUseOrgSidAndModelSidAndConfigSid(pq);
+        return rb.success().setData(pv);
+    }
+
     /**
      * 手机端车型库列表
      *

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<BaseVehmodelCo
     public List<BaseVehmodelConfigVo> getListByConfigSidAndUseOrgSid(String configSid, String createOrgSId) {
         return baseMapper.getListByConfigSidAndUseOrgSid(configSid, createOrgSId);
     }
+
+    public PagerVo<BaseVehmodelConfigVos> selVehModelByUseOrgSidAndModelSidAndConfigSid(PagerQuery<BaseVehmodelConfigQuerys> pq) {
+        BaseVehmodelConfigQuerys query = pq.getParams();
+        QueryWrapper<BaseVehmodelConfigVos> 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<String> stringList = Arrays.asList(sidList);
+            qw.ne("bvc.modelSid",stringList.get(0)).ne("bvc.configurationItemsSid",stringList.get(1));
+        }
+        IPage<BaseVehmodelConfig> page = PagerUtil.queryToPage(pq);
+        IPage<BaseVehmodelConfigVos> pagging = baseMapper.selVehModelByUseOrgSidAndModelSidAndConfigSid(page, qw);
+        PagerVo<BaseVehmodelConfigVos> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

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);

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<SysMenuRoleMapper, Sy
 			/*if (org.apache.commons.lang3.StringUtils.isNotBlank(query.getRoleSid())) {
 				qw.in("rm.roleSid", query.getRoleSid());
 			}*/
-            if (StringUtils.isBlank(query.getIsAdmin())) {
+            if (StringUtils.isNotBlank(query.getIsAdmin())) {
-                qw.eq("m.isEnable", 1);
+                if (!query.getIsAdmin().equals("1")){
+                    qw.eq("m.isEnable", 1);
+                }
             }
 
             if (query.getRoleSids() != null && query.getRoleSids().size() > 0) {

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<SysStaffinfoMapper,
     private SysPostService sysPostService;
     @Autowired
     private SysOrganizationService sysOrganizationService;
+    @Autowired
+    private SysUserRoleService sysUserRoleService;
+    @Autowired
+    private SysRoleService sysRoleService;
 
     public List<SysStaffinfoAppContactsVo> selectAppContactsList() {
         List<SysStaffinfoAppContactsVo> list = baseMapper.selectAppContactsList();
@@ -200,6 +209,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
      */
     public ResultBean saveStaffInfo(SysStaffinfoDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        SysRoleVo sysRoleVo = sysRoleService.fetchByName("试用期员工");
+        if (sysRoleVo == null){
+            return rb.setMsg("缺少默认试用期员工角色");
+        }
         //员工类型
         //String personTypeKey = dto.getPersonTypeKey();
         String jobNumber = "";
@@ -328,6 +341,7 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (StringUtils.isBlank(sysStaffPostDto.getPostSid())) {
             return rb.setMsg("岗位不能为空");
         }
+
         save(sysStaffinfo3);
         //添加用户信息
         SysUser sysUser = new SysUser();
@@ -346,6 +360,10 @@ public class SysStaffinfoService extends MybatisBaseService<SysStaffinfoMapper,
         if (!isSave) {
             return rb.setMsg("添加员工信息失败");
         }
+        SysUserRole sysUserRole = new SysUserRole();
+        sysUserRole.setUserSid(sysUser.getSid());
+        sysUserRole.setRoleSid(sysRoleVo.getSid());
+        sysUserRoleService.save(sysUserRole);
         return rb.success().setMsg("添加员工信息成功");
 
     }