Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java

@@ -0,0 +1,64 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basebrandletpricepowimit;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(品牌让价权限) <br/>
+ * File: BaseBrandletpricepowimit.java <br/>
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimit <br/>
+ * Description: 品牌让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌让价权限表", description = "品牌让价权限表")
+@TableName("base_brandletpricepowimit")
+public class BaseBrandletpricepowimit extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDetailsVo.java

@@ -0,0 +1,70 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basebrandletpricepowimit;
+
+
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(品牌让价权限) <br/>
+ * File: BaseBrandletpricepowimitVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo <br/>
+ * Description: 品牌让价权限表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌让价权限表 视图数据详情", description = "品牌让价权限表 视图数据详情")
+public class BaseBrandletpricepowimitDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("角色让价权限")
+    private List<BaseRoleletpricepowimitDetailsVo> baseRoleletpricepowimits;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basebrandletpricepowimit;
+
+
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto;
+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: BaseBrandletpricepowimitDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDto <br/>
+ * Description: 品牌让价权限表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌让价权限表 数据传输对象", description = "品牌让价权限表 数据传输对象")
+public class BaseBrandletpricepowimitDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+    @ApiModelProperty("角色让价权限")
+    private List<BaseRoleletpricepowimitDto> baseRoleletpricepowimits;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basebrandletpricepowimit;
+
+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: BaseBrandletpricepowimitFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign <br/>
+ * Description: 品牌让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "品牌让价权限表")
+@FeignClient(
+        contextId = "anrui-base-BaseBrandletpricepowimit",
+        name = "anrui-base",
+        path = "v1/basebrandletpricepowimit",
+        fallback = BaseBrandletpricepowimitFeignFallback.class)
+public interface BaseBrandletpricepowimitFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseBrandletpricepowimitVo>> listPage(@RequestBody PagerQuery<BaseBrandletpricepowimitQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseBrandletpricepowimitDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseBrandletpricepowimitDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basebrandletpricepowimit;
+
+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: BaseBrandletpricepowimitFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeignFallback <br/>
+ * Description: 品牌让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseBrandletpricepowimitFeignFallback implements BaseBrandletpricepowimitFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseBrandletpricepowimitVo>> listPage(PagerQuery<BaseBrandletpricepowimitQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basebrandletpricepowimit/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseBrandletpricepowimitDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basebrandletpricepowimit/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basebrandletpricepowimit/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseBrandletpricepowimitDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basebrandletpricepowimit/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitQuery.java

@@ -0,0 +1,58 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basebrandletpricepowimit;
+
+
+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: BaseBrandletpricepowimitQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitQuery <br/>
+ * Description: 品牌让价权限表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌让价权限表 查询条件", description = "品牌让价权限表 查询条件")
+public class BaseBrandletpricepowimitQuery implements Query {
+
+    @ApiModelProperty("组织全路径")
+    private String orgSidPath; // 组织全路径
+	@ApiModelProperty("品牌sid")
+    private String brandSid; // 品牌sid
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitVo.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basebrandletpricepowimit;
+
+
+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: BaseBrandletpricepowimitVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo <br/>
+ * Description: 品牌让价权限表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "品牌让价权限表 视图数据对象", description = "品牌让价权限表 视图数据对象")
+public class BaseBrandletpricepowimitVo implements Vo {
+
+    private String sid; // sid
+
+    @ApiModelProperty("角色让价权限")
+    private String roleLetPrice; // 角色让价权限
+	@ApiModelProperty("品牌名称")
+    private String brandName; // 品牌名称
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+
+}

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

@@ -60,4 +60,15 @@ public class BaseDiscountpackage extends BaseEntity {
 
     @ApiModelProperty("使用组织")
     private String useOrgName;
+
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId;
+    @ApiModelProperty("任务id")
+    private String taskId;
 }

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

@@ -1,12 +1,15 @@
 package com.yxt.anrui.base.api.basediscountpackage;
 
 
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto;
 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: base_discountpackage(优惠包) <br/>
  * File: BaseDiscountpackageDto.java <br/>
@@ -63,9 +66,23 @@ public class BaseDiscountpackageDto implements Dto {
     @ApiModelProperty("使用组织")
     private String useOrgName;
 
-    @ApiModelProperty("用户sid")
-    private String userSid;
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
 
     @ApiModelProperty("业务员sid")
     private String staffSid;
+
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @ApiModelProperty("销售车辆列表")
+    private List<BaseDiscountpackageVehDto> baseDiscountpackageVehs;
 }

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

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.basediscountpackage;
 
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackage.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -73,4 +74,40 @@ public interface BaseDiscountpackageFeign {
     @ApiOperation("移动端-销售订单获取销售政策优惠包:切换机构")
     @GetMapping("/getAppPackage")
     ResultBean<List<AppBaseDiscountpackageVo>> getAppPackage(@SpringQueryMap AppBaseDiscountpackageQuery appBaseDiscountpackageQuery);
+
+    /*****************************销售政策流程****************************************************/
+
+    @ApiOperation("提交销售政策流程")
+    @PostMapping("/submitBaseDiscountpackage")
+    public ResultBean submitBaseDiscountpackage(@Valid @RequestBody SubmitBaseDiscountpackageDto dto);
+
+    /**
+     * @param bvd
+     * @return
+     */
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody BaseDiscountpackageCompleteDto bvd);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean<List<GetNodeVo>> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean<List<GetNodeVo>> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@Valid @RequestBody BaseDiscountpackageTaskQuery query);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@Valid @RequestBody BaseDiscountpackageTaskQuery query);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@Valid @RequestBody BaseDiscountpackageTaskQuery query);
+
+
 }

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

@@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.basediscountpackage;
 
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackage.flow.*;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
@@ -71,5 +72,40 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
         return null;
     }
 
+    @Override
+    public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(BaseDiscountpackageCompleteDto bvd) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean taskReject(BaseDiscountpackageTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(BaseDiscountpackageTaskQuery query) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(BaseDiscountpackageTaskQuery query) {
+        return null;
+    }
+
 
 }

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

@@ -46,4 +46,14 @@ public class BaseDiscountpackagePageListVo implements Vo {
     @ApiModelProperty("使用组织")
     private String useOrgName;
 
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId;
+    @ApiModelProperty("任务id")
+    private String taskId;
 }

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

@@ -1,12 +1,16 @@
 package com.yxt.anrui.base.api.basediscountpackage;
 
 
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * Project: base_discountpackage(优惠包) <br/>
  * File: BaseDiscountpackageVo.java <br/>
@@ -27,6 +31,9 @@ public class BaseDiscountpackageVo implements Vo {
     @ApiModelProperty("优惠情况")
     private String sid;
 
+    @ApiModelProperty("创建人sid")
+    private String createBySid;
+
     @ApiModelProperty("优惠类型key")
     private String discountTypeKey;
 
@@ -62,4 +69,18 @@ public class BaseDiscountpackageVo implements Vo {
 
     @ApiModelProperty("使用组织")
     private String useOrgName;
+
+    @ApiModelProperty("流程定义的id")
+    private String procDefId;
+    @ApiModelProperty("环节定义的sid")
+    private String nodeSid;
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+    @ApiModelProperty("流程实例的sid")
+    private String procInstId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+
+    @ApiModelProperty("销售车辆列表")
+    private List<BaseDiscountpackageVehDetailsVo> baseDiscountpackageVehs;
 }

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

@@ -0,0 +1,43 @@
+package com.yxt.anrui.base.api.basediscountpackage.flow;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class BaseDiscountpackageCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "用户全路径不能为空")
+    private String orgSidPath;
+    @ApiModelProperty(value = "节点id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+    @ApiModelProperty(value = "任务id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    @ApiModelProperty(value = "流程id")
+    @NotBlank(message = "参数错误：instanceId")
+    private String instanceId;
+    @ApiModelProperty(value = "意见")
+    @NotBlank(message = "参数错误：comment")
+    private String comment;
+    @ApiModelProperty(value = "业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
+    private Map<String, Object> formVariables;
+
+    private String orgPath;
+}

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

@@ -0,0 +1,56 @@
+package com.yxt.anrui.base.api.basediscountpackage.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 17:29
+ * @Description 终止、撤回、驳回查询参数
+ */
+@Data
+public class BaseDiscountpackageTaskQuery implements Query {
+    private static final long serialVersionUID = -4006020771892400451L;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("任务Id")
+    @NotBlank(message = "参数错误：taskId")
+    private String taskId;
+    /**
+     * 终止、驳回、撤回
+     */
+    @ApiModelProperty("业务sid")
+    @NotBlank(message = "参数错误：businessSid")
+    private String businessSid;
+    /**
+     * 终止、驳回
+     */
+    @ApiModelProperty("任务意见")
+    private String comment;
+    /**
+     * 终止、撤回
+     */
+    @ApiModelProperty("用户Sid")
+    private String userSid;
+    /**
+     * 终止
+     */
+    @ApiModelProperty("流程实例Id")
+    private String instanceId;
+    /*@ApiModelProperty("用户Id")
+    private String userId;
+    @ApiModelProperty("节点")
+    private String targetKey;
+    @ApiModelProperty("流程变量信息")
+    private Map<String, Object> values = new HashMap<>();
+    @ApiModelProperty("审批人")
+    private String assignee;
+    @ApiModelProperty("候选人")
+    private List<String> candidateUsers = new ArrayList<>();
+    @ApiModelProperty("审批组")
+    private List<String> candidateGroups = new ArrayList<>();*/
+}

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

@@ -0,0 +1,28 @@
+package com.yxt.anrui.base.api.basediscountpackage.flow;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 10:42
+ * @Description
+ */
+@Data
+public class GetNodeQuery implements Query {
+    private static final long serialVersionUID = -5674867230708197611L;
+
+    @ApiModelProperty(value = "环节定义id")
+    @NotBlank(message = "参数错误：taskDefKey")
+    private String taskDefKey;
+
+    @ApiModelProperty(value = "优惠包类别key")
+    private String discountTypeKey;
+
+    @ApiModelProperty(value = "不确定是否需要前端传：还是有分支网关的时候传？？")
+    private Map<String, Object> formVariables;
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.base.api.basediscountpackage.flow;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 11:09
+ * @Description
+ */
+@Data
+public class GetNodeVo implements Vo {
+    private static final long serialVersionUID = 8802774014747063504L;
+    @ApiModelProperty(value = "节点名称")
+    private String name;
+    @ApiModelProperty(value = "节点id")
+    private String id;
+    @ApiModelProperty(value = "审批组")
+    private List<String> candidateGroups;
+    @ApiModelProperty(value = "是否是最后环节")
+    private String endTask;
+}

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

@@ -0,0 +1,22 @@
+package com.yxt.anrui.base.api.basediscountpackage.flow;
+
+import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageDto;
+import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitBaseDiscountpackageDto extends BaseDiscountpackageDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    @ApiModelProperty("意见")
+    private String comment;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVeh.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageveh;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(销售政策车辆表) <br/>
+ * File: BaseDiscountpackageVeh.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVeh <br/>
+ * Description: 销售政策车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:17 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售政策车辆表", description = "销售政策车辆表")
+@TableName("base_discountpackage_veh")
+public class BaseDiscountpackageVeh extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("车型sid")
+    private String vehModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String vehModelName; // 车型名称
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private BigDecimal manufactorSettlementPrice; // 厂家结算价
+	@ApiModelProperty("厂家入库日期")
+    private String priceDate; // 厂家入库日期
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("销售指导价(贷款)")
+    private BigDecimal guidedDKPrice; // 销售指导价(贷款)
+	@ApiModelProperty("销售指导价(全款)")
+    private BigDecimal guidedQKPrice; // 销售指导价(全款)
+    @ApiModelProperty("销售政策sid")
+    private String mainSid; // 销售政策sid
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehDetailsVo.java

@@ -0,0 +1,83 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageveh;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+/**
+ * Project: anrui-base(销售政策车辆表) <br/>
+ * File: BaseDiscountpackageVehVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo <br/>
+ * Description: 销售政策车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售政策车辆表 视图数据详情", description = "销售政策车辆表 视图数据详情")
+public class BaseDiscountpackageVehDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车型sid")
+    private String vehModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String vehModelName; // 车型名称
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String manufactorSettlementPrice; // 厂家结算价
+	@ApiModelProperty("厂家入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date priceDate; // 厂家入库日期
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("销售指导价(贷款)")
+    private String guidedDKPrice; // 销售指导价(贷款)
+	@ApiModelProperty("销售指导价(全款)")
+    private String guidedQKPrice; // 销售指导价(全款)
+    @ApiModelProperty("销售政策sid")
+    private String mainSid; // 销售政策sid
+    @ApiModelProperty(value = "厂家库龄")
+    private Long libraryAge;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehDto.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageveh;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(销售政策车辆表) <br/>
+ * File: BaseDiscountpackageVehDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto <br/>
+ * Description: 销售政策车辆表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:17 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售政策车辆表 数据传输对象", description = "销售政策车辆表 数据传输对象")
+public class BaseDiscountpackageVehDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车型sid")
+    private String vehModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String vehModelName; // 车型名称
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private BigDecimal manufactorSettlementPrice; // 厂家结算价
+	@ApiModelProperty("厂家入库日期")
+    private String priceDate; // 厂家入库日期
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("销售指导价(贷款)")
+    private BigDecimal guidedDKPrice; // 销售指导价(贷款)
+	@ApiModelProperty("销售指导价(全款)")
+    private BigDecimal guidedQKPrice; // 销售指导价(全款)
+    @ApiModelProperty("销售政策sid")
+    private String mainSid; // 销售政策sid
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageveh;
+
+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: BaseDiscountpackageVehFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehFeign <br/>
+ * Description: 销售政策车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:17 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售政策车辆表")
+@FeignClient(
+        contextId = "anrui-base-BaseDiscountpackageVeh",
+        name = "anrui-base",
+        path = "v1/basediscountpackageveh",
+        fallback = BaseDiscountpackageVehFeignFallback.class)
+public interface BaseDiscountpackageVehFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseDiscountpackageVehVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackageVehQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseDiscountpackageVehDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseDiscountpackageVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageveh;
+
+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: BaseDiscountpackageVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehFeignFallback <br/>
+ * Description: 销售政策车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:17 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseDiscountpackageVehFeignFallback implements BaseDiscountpackageVehFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseDiscountpackageVehVo>> listPage(PagerQuery<BaseDiscountpackageVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basediscountpackageveh/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseDiscountpackageVehDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basediscountpackageveh/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basediscountpackageveh/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseDiscountpackageVehDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basediscountpackageveh/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehQuery.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageveh;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * Project: anrui-base(销售政策车辆表) <br/>
+ * File: BaseDiscountpackageVehQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehQuery <br/>
+ * Description: 销售政策车辆表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:17 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售政策车辆表 查询条件", description = "销售政策车辆表 查询条件")
+public class BaseDiscountpackageVehQuery implements Query {
+
+	@ApiModelProperty("车型sid")
+    private String vehModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String vehModelName; // 车型名称
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String manufactorSettlementPrice; // 厂家结算价
+	@ApiModelProperty("厂家入库日期")
+    private String priceDate; // 厂家入库日期
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("销售指导价(贷款)")
+    private String guidedDKPrice; // 销售指导价(贷款)
+	@ApiModelProperty("销售指导价(全款)")
+    private String guidedQKPrice; // 销售指导价(全款)
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehVo.java

@@ -0,0 +1,75 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageveh;
+
+
+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: BaseDiscountpackageVehVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo <br/>
+ * Description: 销售政策车辆表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:17 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "销售政策车辆表 视图数据对象", description = "销售政策车辆表 视图数据对象")
+public class BaseDiscountpackageVehVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("车型sid")
+    private String vehModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String vehModelName; // 车型名称
+	@ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+	@ApiModelProperty("车架号")
+    private String vinNo; // 车架号
+	@ApiModelProperty("厂家结算价")
+    private String manufactorSettlementPrice; // 厂家结算价
+	@ApiModelProperty("厂家入库日期")
+    private String priceDate; // 厂家入库日期
+	@ApiModelProperty("买断状态key")
+    private String settlementStatus; // 买断状态key
+	@ApiModelProperty("买断状态value")
+    private String settlementStatusValue; // 买断状态value
+	@ApiModelProperty("销售指导价(贷款)")
+    private String guidedDKPrice; // 销售指导价(贷款)
+	@ApiModelProperty("销售指导价(全款)")
+    private String guidedQKPrice; // 销售指导价(全款)
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java

@@ -83,7 +83,7 @@ public interface BaseInternalPurchaseFeign {
     @ResponseBody
     public ResultBean<BaseInternalPurchaseDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
-    /*****************************车型调价流程****************************************************/
+    /*****************************车型调车流程****************************************************/
 
     @ApiOperation("提交调车审批流程")
     @PostMapping("/submitBaseInternalPurchase")

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimit.java

@@ -0,0 +1,62 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseroleletpricepowimit;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(品牌让价权限) <br/>
+ * File: BaseRoleletpricepowimit.java <br/>
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimit <br/>
+ * Description: 角色让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "角色让价权限表", description = "角色让价权限表")
+@TableName("base_roleletpricepowimit")
+public class BaseRoleletpricepowimit extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("角色sid")
+    private String roleSid; // 角色sid
+	@ApiModelProperty("角色名称")
+    private String roleName; // 角色名称
+	@ApiModelProperty("让价金额")
+    private String letPrice; // 让价金额
+	@ApiModelProperty("品牌让价权限sid")
+    private String mainSid; // 品牌让价权限sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitDetailsVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseroleletpricepowimit;
+
+
+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: BaseRoleletpricepowimitVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo <br/>
+ * Description: 角色让价权限表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "角色让价权限表 视图数据详情", description = "角色让价权限表 视图数据详情")
+public class BaseRoleletpricepowimitDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("角色sid")
+    private String roleSid; // 角色sid
+	@ApiModelProperty("角色名称")
+    private String roleName; // 角色名称
+	@ApiModelProperty("让价金额")
+    private String letPrice; // 让价金额
+	@ApiModelProperty("品牌让价权限sid")
+    private String mainSid; // 品牌让价权限sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitDto.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseroleletpricepowimit;
+
+
+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: BaseRoleletpricepowimitDto.java <br/>
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto <br/>
+ * Description: 角色让价权限表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "角色让价权限表 数据传输对象", description = "角色让价权限表 数据传输对象")
+public class BaseRoleletpricepowimitDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("角色sid")
+    private String roleSid; // 角色sid
+	@ApiModelProperty("角色名称")
+    private String roleName; // 角色名称
+	@ApiModelProperty("让价金额")
+    private String letPrice; // 让价金额
+	@ApiModelProperty("品牌让价权限sid")
+    private String mainSid; // 品牌让价权限sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitFeign.java

@@ -0,0 +1,78 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseroleletpricepowimit;
+
+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: BaseRoleletpricepowimitFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitFeign <br/>
+ * Description: 角色让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "角色让价权限表")
+@FeignClient(
+        contextId = "anrui-base-BaseRoleletpricepowimit",
+        name = "anrui-base",
+        path = "v1/baseroleletpricepowimit",
+        fallback = BaseRoleletpricepowimitFeignFallback.class)
+public interface BaseRoleletpricepowimitFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseRoleletpricepowimitVo>> listPage(@RequestBody PagerQuery<BaseRoleletpricepowimitQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseRoleletpricepowimitDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseRoleletpricepowimitDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseroleletpricepowimit;
+
+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: BaseRoleletpricepowimitFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitFeignFallback <br/>
+ * Description: 角色让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseRoleletpricepowimitFeignFallback implements BaseRoleletpricepowimitFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseRoleletpricepowimitVo>> listPage(PagerQuery<BaseRoleletpricepowimitQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseroleletpricepowimit/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseRoleletpricepowimitDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseroleletpricepowimit/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/baseroleletpricepowimit/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseRoleletpricepowimitDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/baseroleletpricepowimit/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitQuery.java

@@ -0,0 +1,61 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseroleletpricepowimit;
+
+
+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: BaseRoleletpricepowimitQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitQuery <br/>
+ * Description: 角色让价权限表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "角色让价权限表 查询条件", description = "角色让价权限表 查询条件")
+public class BaseRoleletpricepowimitQuery implements Query {
+
+	@ApiModelProperty("角色sid")
+    private String roleSid; // 角色sid
+	@ApiModelProperty("角色名称")
+    private String roleName; // 角色名称
+	@ApiModelProperty("让价金额")
+    private String letPrice; // 让价金额
+	@ApiModelProperty("品牌让价权限sid")
+    private String mainSid; // 品牌让价权限sid
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitVo.java

@@ -0,0 +1,63 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.baseroleletpricepowimit;
+
+
+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: BaseRoleletpricepowimitVo.java <br/>
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo <br/>
+ * Description: 角色让价权限表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "角色让价权限表 视图数据对象", description = "角色让价权限表 视图数据对象")
+public class BaseRoleletpricepowimitVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("角色sid")
+    private String roleSid; // 角色sid
+	@ApiModelProperty("角色名称")
+    private String roleName; // 角色名称
+	@ApiModelProperty("让价金额")
+    private String letPrice; // 让价金额
+	@ApiModelProperty("品牌让价权限sid")
+    private String mainSid; // 品牌让价权限sid
+
+}

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

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicle;
+
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Data
+@ApiModel(value = "销售政策选择车辆 查询条件", description = "销售政策选择车辆 查询条件")
+public class BaseDiscountpackageGetVehQuery implements Query {
+
+    @ApiModelProperty(value = "品牌")
+    private String brandSid;
+    @ApiModelProperty(value = "功能")
+    private String vehicleType;
+    @ApiModelProperty(value = "系列")
+    private String productLine;
+    @ApiModelProperty(value = "变速箱")
+    private String gearboxType;
+    @ApiModelProperty(value = "驱动")
+    private String driveForm;
+    @ApiModelProperty(value = "排放标准")
+    private String emissionStandard;
+    @ApiModelProperty(value = "马力")
+    private String power;
+    @ApiModelProperty(value = "燃料")
+    private String fuelType;
+    @ApiModelProperty(value = "版本")
+    private String vehicleVersion;
+    @ApiModelProperty(value = "车型")
+    private String vehicleAlias;
+    @ApiModelProperty(value = "快捷检索车型")
+    private String modelName;
+
+    @ApiModelProperty("车辆sid")
+    private List<String> vehSids; // 车辆sid
+
+    @ApiModelProperty(value = "orgSid")
+    private String orgSid;
+}

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

@@ -0,0 +1,69 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basevehicle;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+@ApiModel(value = "销售政策选择车辆 视图数据对象", description = "销售政策选择车辆 视图数据对象")
+public class BaseDiscountpackageGetVehVo implements Query {
+
+    @ApiModelProperty("车辆sid")
+    private String vehSid; // 车辆sid
+    @ApiModelProperty(value = "存放地点")
+    private String locationName;
+    @ApiModelProperty("品牌")
+    private String brandName;
+    @ApiModelProperty("车架号")
+    private String vinNo;
+	@ApiModelProperty("车型sid")
+    private String vehModelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String vehModelName; // 车型名称
+    @ApiModelProperty("入库日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date priceDate;
+    @ApiModelProperty(value = "厂家库龄")
+    private Long libraryAge;
+    @ApiModelProperty("买断状态")
+    private String settlementStatus;
+    @ApiModelProperty("买断状态value")
+    private String settlementStatusValue;
+    @ApiModelProperty("厂家结算价")
+    private String manufactorSettlementPrice; // 厂家结算价
+    @ApiModelProperty("销售指导价(贷款)")
+    private BigDecimal guidedDKPrice; // 销售指导价(贷款)
+    @ApiModelProperty("销售指导价(全款)")
+    private BigDecimal guidedQKPrice; // 销售指导价(全款)
+}

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

@@ -317,6 +317,11 @@ public interface BaseVehicleFeign {
     @PostMapping("/selectVo")
     ResultBean<PagerVo<PcBaseVehicleOrderVo>> selectVo(@RequestBody PagerQuery<PcBaseVehicleOrderQuery> pcBaseVehicleOrderQuery);
 
+    @ApiOperation("销售政策选择车辆列表")
+    @PostMapping("/baseDisCountPackageGetVeh")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseDiscountpackageGetVehVo>> baseDisCountPackageGetVeh(@RequestBody PagerQuery<BaseDiscountpackageGetVehQuery> pq);
+
     @ApiOperation("销售订单-根据车型和配置sid查询现车的数量")
     @GetMapping("/selectCount")
     ResultBean<Integer> selectCount(@SpringQueryMap PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery);

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

@@ -211,6 +211,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign {
         return null;
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseDiscountpackageGetVehVo>> baseDisCountPackageGetVeh(PagerQuery<BaseDiscountpackageGetVehQuery> pq) {
+        return null;
+    }
+
     @Override
     public ResultBean<Integer> selectCount(PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery) {
         return null;

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.java

@@ -0,0 +1,68 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basebrandletpricepowimit;
+
+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.basebrandletpricepowimit.BaseBrandletpricepowimit;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(品牌让价权限) <br/>
+ * File: BaseBrandletpricepowimitMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basebrandletpricepowimit.BaseBrandletpricepowimitMapper <br/>
+ * Description: 品牌让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseBrandletpricepowimitMapper extends BaseMapper<BaseBrandletpricepowimit> {
+
+	//@Update("update base_brandletpricepowimit set name=#{msg} where id=#{id}")
+	//IPage<BaseBrandletpricepowimitVo> voPage(IPage<BaseBrandletpricepowimit> page, @Param(Constants.WRAPPER) QueryWrapper<BaseBrandletpricepowimit> qw);
+	
+	IPage<BaseBrandletpricepowimitVo> selectPageVo(IPage<BaseBrandletpricepowimit> page, @Param(Constants.WRAPPER) Wrapper<BaseBrandletpricepowimit> qw);
+	
+	List<BaseBrandletpricepowimitVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseBrandletpricepowimit> qw);
+	
+	@Select("select * from base_brandletpricepowimit")
+	List<BaseBrandletpricepowimitVo> selectListVo();
+
+	BaseBrandletpricepowimitVo fetchByBrandSidAndUseOrgSid(@Param("brandSid") String brandSid,@Param("useOrgSid") String useOrgSid);
+
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.xml

@@ -0,0 +1,28 @@
+<?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.basebrandletpricepowimit.BaseBrandletpricepowimitMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo">
+        SELECT * FROM base_brandletpricepowimit
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo"
+            resultType="com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo">
+        SELECT * FROM base_brandletpricepowimit
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="fetchByBrandSidAndUseOrgSid"
+            resultType="com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo">
+        SELECT *
+        FROM base_brandletpricepowimit
+        WHERE brandSid = #{brandSid}
+          AND useOrgSid = #{useOrgSid}
+    </select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitRest.java

@@ -0,0 +1,99 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basebrandletpricepowimit;
+
+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.apache.ibatis.annotations.Delete;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimit;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitQuery;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDetailsVo;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDto;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
+
+/**
+ * Project: anrui-base(品牌让价权限) <br/>
+ * File: BaseBrandletpricepowimitFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basebrandletpricepowimit.BaseBrandletpricepowimitRest <br/>
+ * Description: 品牌让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "品牌让价权限表")
+@RestController("com.yxt.anrui.base.biz.basebrandletpricepowimit.BaseBrandletpricepowimitRest")
+@RequestMapping("v1/basebrandletpricepowimit")
+public class BaseBrandletpricepowimitRest implements BaseBrandletpricepowimitFeign {
+
+	@Autowired
+	private BaseBrandletpricepowimitService baseBrandletpricepowimitService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseBrandletpricepowimitVo>> listPage(@RequestBody PagerQuery<BaseBrandletpricepowimitQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseBrandletpricepowimitVo> pv = baseBrandletpricepowimitService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseBrandletpricepowimitDto dto){
+		return baseBrandletpricepowimitService.saveOrUpdateDto(dto);
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseBrandletpricepowimitService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseBrandletpricepowimitDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseBrandletpricepowimitDetailsVo vo = baseBrandletpricepowimitService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java

@@ -0,0 +1,186 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basebrandletpricepowimit;
+
+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.baseroleletpricepowimit.BaseRoleletpricepowimit;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto;
+import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
+import com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitService;
+import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
+import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+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.basebrandletpricepowimit.BaseBrandletpricepowimit;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitQuery;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDetailsVo;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDto;
+import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(品牌让价权限) <br/>
+ * File: BaseBrandletpricepowimitService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basebrandletpricepowimit.BaseBrandletpricepowimitService <br/>
+ * Description: 品牌让价权限表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseBrandletpricepowimitService extends MybatisBaseService<BaseBrandletpricepowimitMapper, BaseBrandletpricepowimit> {
+
+    @Autowired
+    private BaseRoleletpricepowimitService baseRoleletpricepowimitService;
+    @Autowired
+    private SysOrganizationFeign organizationFeign;
+    @Autowired
+    private BaseVehicleBrandService baseVehicleBrandService;
+
+    private QueryWrapper<BaseBrandletpricepowimit> createQueryWrapper(BaseBrandletpricepowimitQuery query) {
+        // todo: 这里根据具体业务调整查询条件
+        // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+        QueryWrapper<BaseBrandletpricepowimit> qw = new QueryWrapper<>();
+        return qw;
+    }
+
+    public PagerVo<BaseBrandletpricepowimitVo> listPageVo(PagerQuery<BaseBrandletpricepowimitQuery> pq) {
+        BaseBrandletpricepowimitQuery query = pq.getParams();
+        String orgSidPath = query.getOrgSidPath();
+        String sybOrgSid = orgSidPath.substring(37, 73);
+        List<SysOrganizationVo> sysOrganizationVos = organizationFeign.selectOrgByPSid(sybOrgSid).getData();
+        if (!sysOrganizationVos.isEmpty()) {
+            for (SysOrganizationVo sysOrganizationVo : sysOrganizationVos) {
+                List<BaseVehicleBrand> baseVehicleBrands = baseVehicleBrandService.selectByUseOrgSid(sysOrganizationVo.getSid());
+                if (!baseVehicleBrands.isEmpty()) {
+                    for (BaseVehicleBrand baseVehicleBrand : baseVehicleBrands) {
+                        BaseBrandletpricepowimitVo baseBrandletpricepowimitVo = baseMapper.fetchByBrandSidAndUseOrgSid(baseVehicleBrand.getSid(), sysOrganizationVo.getSid());
+                        if (baseBrandletpricepowimitVo == null) {
+                            BaseBrandletpricepowimit baseBrandletpricepowimit = new BaseBrandletpricepowimit();
+                            baseBrandletpricepowimit.setBrandSid(baseVehicleBrand.getSid());
+                            baseBrandletpricepowimit.setBrandName(baseVehicleBrand.getBrandName());
+                            baseBrandletpricepowimit.setUseOrgSid(sysOrganizationVo.getSid());
+                            baseBrandletpricepowimit.setUseOrgName(sysOrganizationVo.getName());
+                            baseBrandletpricepowimit.setCreateOrgSid(sybOrgSid);
+                            save(baseBrandletpricepowimit);
+                        }
+                    }
+                }
+            }
+        }
+        QueryWrapper<BaseBrandletpricepowimit> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getBrandSid())) {
+            qw.eq("brandSid", query.getBrandSid());
+        }
+        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
+            qw.eq("useOrgSid", query.getUseOrgSid());
+        }
+        IPage<BaseBrandletpricepowimit> page = PagerUtil.queryToPage(pq);
+        IPage<BaseBrandletpricepowimitVo> pagging = baseMapper.selectPageVo(page, qw);
+        for (BaseBrandletpricepowimitVo record : pagging.getRecords()) {
+            String sid = record.getSid();
+            List<BaseRoleletpricepowimitDetailsVo> baseRoleletpricepowimitDetailsVos = baseRoleletpricepowimitService.fetchByMainSid(sid);
+            if (!baseRoleletpricepowimitDetailsVos.isEmpty()) {
+                StringBuilder roleLetPrice = new StringBuilder();
+                for (BaseRoleletpricepowimitDetailsVo baseRoleletpricepowimitDetailsVo : baseRoleletpricepowimitDetailsVos) {
+                    String roleName = baseRoleletpricepowimitDetailsVo.getRoleName();
+                    String letPrice = baseRoleletpricepowimitDetailsVo.getLetPrice();
+                    roleLetPrice.append(roleName).append("(").append(letPrice).append(")").append("、");
+                }
+                record.setRoleLetPrice(roleLetPrice.substring(0,roleLetPrice.lastIndexOf("、")));
+            }
+        }
+        PagerVo<BaseBrandletpricepowimitVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
+
+    public ResultBean saveOrUpdateDto(BaseBrandletpricepowimitDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        String dtoSid = dto.getSid();
+        List<BaseRoleletpricepowimitDto> baseRoleletpricepowimits = dto.getBaseRoleletpricepowimits();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return rb.success();
+        }
+        this.updateByDto(dto);
+        BaseBrandletpricepowimit baseBrandletpricepowimit = fetchBySid(dtoSid);
+        if (baseBrandletpricepowimit == null) {
+            return rb.setMsg("该品牌让价权限不存在");
+        }
+        baseRoleletpricepowimitService.deleteByMainSid(dtoSid);
+        for (BaseRoleletpricepowimitDto baseRoleletpricepowimitDto : baseRoleletpricepowimits) {
+            BaseRoleletpricepowimit baseRoleletpricepowimit = new BaseRoleletpricepowimit();
+            baseRoleletpricepowimit.setRoleSid(baseRoleletpricepowimitDto.getRoleSid());
+            baseRoleletpricepowimit.setRoleName(baseRoleletpricepowimitDto.getRoleName());
+            baseRoleletpricepowimit.setLetPrice(baseRoleletpricepowimitDto.getLetPrice());
+            baseRoleletpricepowimit.setMainSid(dtoSid);
+            baseRoleletpricepowimitService.save(baseRoleletpricepowimit);
+        }
+        return rb.success().setMsg("修改成功");
+    }
+
+    public void insertByDto(BaseBrandletpricepowimitDto dto) {
+        BaseBrandletpricepowimit entity = new BaseBrandletpricepowimit();
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.insert(entity);
+    }
+
+    public void updateByDto(BaseBrandletpricepowimitDto dto) {
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        }
+        BaseBrandletpricepowimit entity = fetchBySid(dtoSid);
+        BeanUtil.copyProperties(dto, entity, "id", "sid");
+        baseMapper.updateById(entity);
+    }
+
+    public BaseBrandletpricepowimitDetailsVo fetchDetailsVoBySid(String sid) {
+        BaseBrandletpricepowimit entity = fetchBySid(sid);
+        BaseBrandletpricepowimitDetailsVo vo = new BaseBrandletpricepowimitDetailsVo();
+        BeanUtil.copyProperties(entity, vo);
+        List<BaseRoleletpricepowimitDetailsVo> baseRoleletpricepowimitDetailsVos = baseRoleletpricepowimitService.fetchByMainSid(sid);
+        vo.setBaseRoleletpricepowimits(baseRoleletpricepowimitDetailsVos);
+        return vo;
+    }
+}

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

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * Project: base_discountpackage(优惠包) <br/>
@@ -61,4 +62,6 @@ public interface BaseDiscountpackageMapper extends BaseMapper<BaseDiscountpackag
      * @return
      */
     List<AppBaseDiscountpackageVo> getAppPackage(@Param(Constants.WRAPPER) QueryWrapper<BaseDiscountpackage> qw);
+
+    int updateFlowFiled(Map<String, Object> beanToMap);
 }

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

@@ -44,4 +44,19 @@
             ${ew.sqlSegment}
         </where>
     </select>
+
+    <update id="updateFlowFiled">
+        UPDATE base_discountpackage
+        SET nodeState=#{nodeState}, nodeSid=#{taskDefKey}
+        <if test="procDefId != null and procDefId != ''">
+            , procDefId=#{procDefId}
+        </if>
+        <if test="procInsId != null and procInsId != ''">
+            , procInstId=#{procInsId}
+        </if>
+        <if test="taskId != null and taskId != ''">
+            , taskId=#{taskId}
+        </if>
+        WHERE sid=#{sid}
+    </update>
 </mapper>

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

@@ -1,9 +1,13 @@
 package com.yxt.anrui.base.biz.basediscountpackage;
 
+import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basediscountpackage.*;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackage.flow.*;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
@@ -103,12 +107,6 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
     public ResultBean<BaseDiscountpackageVo> fetchSid(String sid) {
         ResultBean rb = ResultBean.fireFail();
         BaseDiscountpackageVo vo = baseDiscountpackageService.selectBySid(sid);
-        String discountMoney = vo.getDiscountMoney();
-        String projectCost = vo.getProjectCost();
-        discountMoney = discountMoney.substring(0,discountMoney.indexOf("."));
-        projectCost = projectCost.substring(0,projectCost.indexOf("."));
-        vo.setDiscountMoney(discountMoney);
-        vo.setProjectCost(projectCost);
         return rb.success().setData(vo);
     }
 
@@ -142,4 +140,42 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
         return baseDiscountpackageService.getAppPackage(appBaseDiscountpackageQuery);
     }
 
+    @Override
+    public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
+        return baseDiscountpackageService.submitBaseDiscountpackage(dto);
+    }
+
+    @Override
+    public ResultBean complete(BaseDiscountpackageCompleteDto bvd) {
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(bvd, bv);
+        bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId());
+        return baseDiscountpackageService.complete(bv);
+    }
+
+    @Override
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        return baseDiscountpackageService.getNextNodesForSubmit(query);
+    }
+
+    @Override
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        return baseDiscountpackageService.getPreviousNodesForReject(query);
+    }
+
+    @Override
+    public ResultBean taskReject(BaseDiscountpackageTaskQuery query) {
+        return baseDiscountpackageService.taskReject(query);
+    }
+
+    @Override
+    public ResultBean revokeProcess(BaseDiscountpackageTaskQuery query) {
+        return baseDiscountpackageService.revokeProcess(query);
+    }
+
+    @Override
+    public ResultBean breakProcess(BaseDiscountpackageTaskQuery query) {
+        return baseDiscountpackageService.breakProcess(query);
+    }
+
 }

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

@@ -1,16 +1,36 @@
 package com.yxt.anrui.base.biz.basediscountpackage;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
+import cn.hutool.core.date.DateUtil;
+import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.basediscountpackage.*;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackage.flow.BaseDiscountpackageTaskQuery;
+import com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo;
+import com.yxt.anrui.base.api.basediscountpackage.flow.SubmitBaseDiscountpackageDto;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVeh;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto;
+import com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehService;
+import com.yxt.anrui.flowable.api.flow.FlowableFeign;
+import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign;
 import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
+import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -22,6 +42,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Project: base_discountpackage(优惠包) <br/>
@@ -48,6 +69,15 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
     @Autowired
     private SysFormLinkFeign sysFormLinkFeign;
 
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
+
+    @Autowired
+    private FlowableFeign flowableFeign;
+
+    @Autowired
+    private BaseDiscountpackageVehService baseDiscountpackageVehService;
+
     /**
      * 优惠政策分页列表
      *
@@ -58,15 +88,6 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         IPage<BaseDiscountpackageQuery> page = PagerUtil.queryToPage(pq);
         QueryWrapper<BaseDiscountpackagePageListVo> qw = buildQueryWrapper(pq.getParams());
         IPage<BaseDiscountpackagePageListVo> busOrderDiscountPageListVoIPage = baseMapper.listPage(page, qw);
-        List<BaseDiscountpackagePageListVo> records = busOrderDiscountPageListVoIPage.getRecords();
-        for (BaseDiscountpackagePageListVo record : records) {
-            String discountMoney = record.getDiscountMoney();
-            String projectCost = record.getProjectCost();
-            discountMoney = discountMoney.substring(0, discountMoney.indexOf("."));
-            projectCost = projectCost.substring(0, projectCost.indexOf("."));
-            record.setDiscountMoney(discountMoney);
-            record.setProjectCost(projectCost);
-        }
         return busOrderDiscountPageListVoIPage;
     }
 
@@ -116,7 +137,17 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         dto.setSid(UUID.randomUUID().toString());
         BeanUtil.copyProperties(dto, entity);
         entity.setUseOrg(orgSid);
+        entity.setNodeState("待提交");
         save(entity);
+        List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
+        for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
+            BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
+            String sid = baseDiscountpackageVeh.getSid();
+            BeanUtil.copyProperties(baseDiscountpackageVehDto,baseDiscountpackageVeh);
+            baseDiscountpackageVeh.setSid(sid);
+            baseDiscountpackageVeh.setMainSid(entity.getSid());
+            baseDiscountpackageVehService.save(baseDiscountpackageVeh);
+        }
         return rb.success().setData(entity.getSid());
     }
 
@@ -131,6 +162,16 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
     public ResultBean updateByDiscountSid(BaseDiscountpackageDto dto, String sid) {
         ResultBean rb = ResultBean.fireFail();
         this.updateBySid(dto.toMap(), sid);
+        baseDiscountpackageVehService.deleteByMainSid(sid);
+        List<BaseDiscountpackageVehDto> baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs();
+        for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) {
+            BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh();
+            String sid1 = baseDiscountpackageVeh.getSid();
+            BeanUtil.copyProperties(baseDiscountpackageVehDto,baseDiscountpackageVeh);
+            baseDiscountpackageVeh.setSid(sid1);
+            baseDiscountpackageVeh.setMainSid(sid);
+            baseDiscountpackageVehService.save(baseDiscountpackageVeh);
+        }
         return rb.success();
     }
 
@@ -175,6 +216,18 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
      */
     public BaseDiscountpackageVo selectBySid(String sid) {
         BaseDiscountpackageVo vo = baseMapper.selectBySid(sid);
+        List<BaseDiscountpackageVehDetailsVo> baseDiscountpackageVehDetailsVos = baseDiscountpackageVehService.fetchByMainSid(sid);
+        for (BaseDiscountpackageVehDetailsVo baseDiscountpackageVehDetailsVo : baseDiscountpackageVehDetailsVos) {
+            if (baseDiscountpackageVehDetailsVo.getPriceDate() != null) {
+                Date priceDate = baseDiscountpackageVehDetailsVo.getPriceDate();
+                String today = DateUtil.today();
+                DateTime currentDate = DateUtil.parse(today);
+                int i = priceDate.compareTo(currentDate);
+                long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
+                baseDiscountpackageVehDetailsVo.setLibraryAge(betweenDay * i * -1);
+            }
+        }
+        vo.setBaseDiscountpackageVehs(baseDiscountpackageVehDetailsVos);
         return vo;
     }
 
@@ -186,7 +239,7 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
      * @return
      */
     public ResultBean submitSalesOrderApprove(BaseDiscountpackageDto dto) {
-        String orgSid = checkUserOrg(dto.getUserSid());
+        String orgSid = checkUserOrg(dto.getCreateBySid());
         String businessSid = "";
         if (StringUtils.isBlank(orgSid)) {
             return new ResultBean().fail().setMsg("用户组织机构不能为空");
@@ -347,4 +400,251 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         }
         return rb.success().setData(voList);
     }
+
+    public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        //根据staffSid获取用户的组织全路径
+        ResultBean<SysStaffOrg> orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid());
+        if (!orgByStaffSid.getSuccess()) {
+            return rb.setMsg(orgByStaffSid.getMsg());
+        }
+        //用户的组织全路径
+        String orgSidPath = orgByStaffSid.getData().getOrgSidPath();
+        BaseDiscountpackage baseDiscountpackage = fetchBySid(dto.getSid());
+        int r = submitBusinessData(dto, baseDiscountpackage);
+        if (r == 3) {
+            return rb.setMsg("该申请不存在");
+        }
+        if (r == 0) {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+        String businessSid = "";
+        //新增修改保存
+        if (StringUtils.isBlank(dto.getSid())) {
+            ResultBean<String> resultBean = saveOrUpdateDto(dto);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            businessSid = resultBean.getData();
+        } else {
+            ResultBean resultBean = updateByDiscountSid(dto, dto.getSid());
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            businessSid = dto.getSid();
+        }
+        //创建BusinessVariables实体对象
+        BusinessVariables bv = new BusinessVariables();
+        //流程中的参数赋值
+        Map<String, Object> variables = BeanUtil.beanToMap(dto);
+        //若有网关，则赋值网关中判断的字段。
+        variables.put("businessSid", businessSid);
+        //=====================添加app所需参数
+        Map<String, Object> appMap = new HashMap<>();
+        appMap.put("sid", businessSid);
+        variables.put("app", appMap);
+        //用户的部门全路径sid
+        bv.setOrgSidPath(orgSidPath);
+        //业务sid
+        bv.setBusinessSid(businessSid);
+        //用户sid
+        bv.setUserSid(dto.getCreateBySid());
+        bv.setFormVariables(variables);
+        //流程定义id
+        bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId());
+        if (r == 1) {
+            ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+            UpdateFlowFieldVo ufVo = voResultBean.getData();
+            updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            return voResultBean;
+        }
+        if (r == 2) {
+            // ToDo:驳回到发起人后再次提交
+            if (StringUtils.isBlank(dto.getInstanceId())) {
+                return rb.setMsg("参数错误：instanceId");
+            }
+            bv.setTaskId(baseDiscountpackage.getTaskId());
+            bv.setTaskDefKey(baseDiscountpackage.getNodeSid());
+            bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交");
+            bv.setInstanceId(dto.getInstanceId());
+            return complete(bv);
+        }
+        return rb;
+    }
+
+    /**
+     * 判断提交的流程是否被允许
+     *
+     * @param dto
+     * @return
+     */
+    private synchronized int submitBusinessData(SubmitBaseDiscountpackageDto dto, BaseDiscountpackage baseDiscountpackage) {
+        int r = 0;
+        if (StringUtils.isBlank(dto.getSid())) {
+            r = 1;
+        } else {
+            if (baseDiscountpackage != null) {
+                String businessTaskId = baseDiscountpackage.getTaskId();
+                if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) {
+                    //新提交
+                    r = 1;
+                } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) {
+                    //二次提交//只有数据一致的时候才能进行下一步
+                    r = 2;
+                }
+            } else {
+                r = 3;
+            }
+
+        }
+        return r;
+    }
+
+    private int updateFlowFiled(Map<String, Object> beanToMap) {
+        return baseMapper.updateFlowFiled(beanToMap);
+    }
+
+    public ResultBean complete(BusinessVariables bv) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseDiscountpackage baseDiscountpackage = fetchBySid(bv.getBusinessSid());
+        Boolean i = false;
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> formVariables = bv.getFormVariables();
+        if ("0001".equals(baseDiscountpackage.getDiscountTypeKey())){
+            i = true;
+        }
+        if (formVariables == null) {
+            map.put("isAdj", i);
+            bv.setFormVariables(map);
+        } else {
+            formVariables.put("isAdj", i);
+        }
+        if (bv.getTaskId().equals(baseDiscountpackage.getTaskId())) {
+            ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
+            if (!resultBean.getSuccess()) {
+                return rb.setMsg(resultBean.getMsg());
+            }
+            updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+            if ("Event_end".equals(resultBean.getData().getTaskDefKey())) {
+            }
+            return rb.success().setData(resultBean.getData());
+        } else {
+            return rb.setMsg("操作失败!提交的数据不一致");
+        }
+    }
+
+    public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId());
+        Boolean i = false;
+        Map<String, Object> map = new HashMap<>();
+        Map<String, Object> formVariables = bv.getFormVariables();
+        if ("0001".equals(query.getDiscountTypeKey())){
+            i = true;
+        }
+        if (formVariables == null) {
+            map.put("isAdj", i);
+            bv.setFormVariables(map);
+        } else {
+            formVariables.put("isAdj", i);
+        }
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean<List<GetNodeVo>> getPreviousNodesForReject(GetNodeQuery query) {
+        ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+        BusinessVariables bv = new BusinessVariables();
+        BeanUtil.copyProperties(query, bv);
+        bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId());
+        ResultBean<List<Map<String, Object>>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv);
+        //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo
+        List<GetNodeVo> voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+//        List<GetNodeVo> voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList());
+        return rb.success().setData(voList);
+    }
+
+    public ResultBean taskReject(BaseDiscountpackageTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        BaseDiscountpackage baseDiscountpackage = fetchBySid(query.getBusinessSid());
+        if (baseDiscountpackage == null) {
+            return rb.setMsg("该申请不存在");
+        }
+        String businessTaskId = baseDiscountpackage.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                if (StringUtils.isBlank(query.getComment())) {
+                    return rb.setMsg("参数错误：comment");
+                }
+                if (StringUtils.isBlank(query.getUserSid())) {
+                    return rb.setMsg("参数错误：userSid");
+                }
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                //更新业务中的流程相关的参数
+                updateFlowFiled(map);
+                return rb.success();
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
+
+    public ResultBean revokeProcess(BaseDiscountpackageTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        //根据业务sid查询排产申请
+        BaseDiscountpackage baseDiscountpackage = fetchBySid(query.getBusinessSid());
+        String businessTaskId = baseDiscountpackage.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败，提交的数据不一致!");
+    }
+
+    public ResultBean breakProcess(BaseDiscountpackageTaskQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        if (StringUtils.isBlank(query.getInstanceId())) {
+            return rb.setMsg("参数错误：instanceId");
+        }
+        if (StringUtils.isBlank(query.getUserSid())) {
+            return rb.setMsg("参数错误：userSid");
+        }
+        BaseDiscountpackage baseDiscountpackage = fetchBySid(query.getBusinessSid());
+        String businessTaskId = baseDiscountpackage.getTaskId();
+        if (StringUtils.isNotBlank(businessTaskId)) {
+            if (businessTaskId.equals(query.getTaskId())) {
+                FlowTaskVo flowTaskVo = new FlowTaskVo();
+                BeanUtil.copyProperties(query, flowTaskVo);
+                ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(flowTaskVo);
+                if (!resultBean.getSuccess()) {
+                    return rb.setMsg(resultBean.getMsg());
+                }
+                Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
+                updateFlowFiled(map);
+                return rb.success().setData(resultBean.getData());
+            }
+        }
+        return rb.setMsg("操作失败!提交的数据不一致!");
+    }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basediscountpackageveh;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo;
+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.basediscountpackageveh.BaseDiscountpackageVeh;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(销售政策车辆表) <br/>
+ * File: BaseDiscountpackageVehMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehMapper <br/>
+ * Description: 销售政策车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:18 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseDiscountpackageVehMapper extends BaseMapper<BaseDiscountpackageVeh> {
+
+	//@Update("update base_discountpackage_veh set name=#{msg} where id=#{id}")
+	//IPage<BaseDiscountpackageVehVo> voPage(IPage<BaseDiscountpackageVeh> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDiscountpackageVeh> qw);
+	
+	IPage<BaseDiscountpackageVehVo> selectPageVo(IPage<BaseDiscountpackageVeh> page, @Param(Constants.WRAPPER) Wrapper<BaseDiscountpackageVeh> qw);
+	
+	List<BaseDiscountpackageVehVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseDiscountpackageVeh> qw);
+	
+	@Select("select * from base_discountpackage_veh")
+	List<BaseDiscountpackageVehVo> selectListVo();
+
+	@Delete("delete from base_discountpackage_veh where mainSid = #{sid}")
+    void deleteByMainSid(String sid);
+
+	@Select("select * from base_discountpackage_veh where mainSid = #{sid}")
+    List<BaseDiscountpackageVehDetailsVo> fetchByMainSid(String sid);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehMapper.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.basediscountpackageveh.BaseDiscountpackageVehMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo">
+		SELECT * FROM base_discountpackage_veh <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo">
+		SELECT * FROM base_discountpackage_veh <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basediscountpackageveh;
+
+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.basediscountpackageveh.BaseDiscountpackageVeh;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehQuery;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehFeign;
+
+/**
+ * Project: anrui-base(销售政策车辆表) <br/>
+ * File: BaseDiscountpackageVehFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehRest <br/>
+ * Description: 销售政策车辆表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:17 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "销售政策车辆表")
+@RestController("com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehRest")
+@RequestMapping("v1/basediscountpackageveh")
+public class BaseDiscountpackageVehRest implements BaseDiscountpackageVehFeign {
+
+	@Autowired
+	private BaseDiscountpackageVehService baseDiscountpackageVehService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseDiscountpackageVehVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackageVehQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseDiscountpackageVehVo> pv = baseDiscountpackageVehService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseDiscountpackageVehDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseDiscountpackageVehService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseDiscountpackageVehService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseDiscountpackageVehDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseDiscountpackageVehDetailsVo vo = baseDiscountpackageVehService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehService.java

@@ -0,0 +1,118 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basediscountpackageveh;
+
+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.basediscountpackageveh.BaseDiscountpackageVeh;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehQuery;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto;
+import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(销售政策车辆表) <br/>
+ * File: BaseDiscountpackageVehService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehService <br/>
+ * Description: 销售政策车辆表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-08 13:44:17 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseDiscountpackageVehService extends MybatisBaseService<BaseDiscountpackageVehMapper, BaseDiscountpackageVeh> {
+	private QueryWrapper<BaseDiscountpackageVeh> createQueryWrapper(BaseDiscountpackageVehQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseDiscountpackageVeh> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseDiscountpackageVehVo> listPageVo(PagerQuery<BaseDiscountpackageVehQuery> pq) {
+		BaseDiscountpackageVehQuery query = pq.getParams();
+		QueryWrapper<BaseDiscountpackageVeh> qw = createQueryWrapper(query);
+		IPage<BaseDiscountpackageVeh> page = PagerUtil.queryToPage(pq);
+		IPage<BaseDiscountpackageVehVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseDiscountpackageVehVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseDiscountpackageVehDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseDiscountpackageVehDto dto){
+		BaseDiscountpackageVeh entity = new BaseDiscountpackageVeh();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseDiscountpackageVehDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseDiscountpackageVeh entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseDiscountpackageVehDetailsVo fetchDetailsVoBySid(String sid){
+		BaseDiscountpackageVeh entity = fetchBySid(sid);
+		BaseDiscountpackageVehDetailsVo vo = new BaseDiscountpackageVehDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public void deleteByMainSid(String sid) {
+		baseMapper.deleteByMainSid(sid);
+	}
+
+	public List<BaseDiscountpackageVehDetailsVo> fetchByMainSid(String sid) {
+		return baseMapper.fetchByMainSid(sid);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseroleletpricepowimit;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo;
+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.baseroleletpricepowimit.BaseRoleletpricepowimit;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(品牌让价权限) <br/>
+ * File: BaseRoleletpricepowimitMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitMapper <br/>
+ * Description: 角色让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseRoleletpricepowimitMapper extends BaseMapper<BaseRoleletpricepowimit> {
+
+	//@Update("update base_roleletpricepowimit set name=#{msg} where id=#{id}")
+	//IPage<BaseRoleletpricepowimitVo> voPage(IPage<BaseRoleletpricepowimit> page, @Param(Constants.WRAPPER) QueryWrapper<BaseRoleletpricepowimit> qw);
+	
+	IPage<BaseRoleletpricepowimitVo> selectPageVo(IPage<BaseRoleletpricepowimit> page, @Param(Constants.WRAPPER) Wrapper<BaseRoleletpricepowimit> qw);
+	
+	List<BaseRoleletpricepowimitVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseRoleletpricepowimit> qw);
+	
+	@Select("select * from base_roleletpricepowimit")
+	List<BaseRoleletpricepowimitVo> selectListVo();
+
+	@Select("select * from base_roleletpricepowimit where mainSid = #{sid}")
+    List<BaseRoleletpricepowimitDetailsVo> fetchByMainSid(String sid);
+
+	@Delete("delete from base_roleletpricepowimit where mainSid = #{sid}")
+    void deleteByMainSid(String dtoSid);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitMapper.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.baseroleletpricepowimit.BaseRoleletpricepowimitMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo">
+		SELECT * FROM base_roleletpricepowimit <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo">
+		SELECT * FROM base_roleletpricepowimit <where> ${ew.sqlSegment} </where>
+	</select>
+</mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseroleletpricepowimit;
+
+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.baseroleletpricepowimit.BaseRoleletpricepowimit;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitQuery;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitFeign;
+
+/**
+ * Project: anrui-base(品牌让价权限) <br/>
+ * File: BaseRoleletpricepowimitFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitRest <br/>
+ * Description: 角色让价权限表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "角色让价权限表")
+@RestController("com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitRest")
+@RequestMapping("v1/baseroleletpricepowimit")
+public class BaseRoleletpricepowimitRest implements BaseRoleletpricepowimitFeign {
+
+	@Autowired
+	private BaseRoleletpricepowimitService baseRoleletpricepowimitService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseRoleletpricepowimitVo>> listPage(@RequestBody PagerQuery<BaseRoleletpricepowimitQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseRoleletpricepowimitVo> pv = baseRoleletpricepowimitService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseRoleletpricepowimitDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseRoleletpricepowimitService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseRoleletpricepowimitService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseRoleletpricepowimitDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseRoleletpricepowimitDetailsVo vo = baseRoleletpricepowimitService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitService.java

@@ -0,0 +1,118 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.baseroleletpricepowimit;
+
+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.baseroleletpricepowimit.BaseRoleletpricepowimit;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitQuery;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto;
+import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(品牌让价权限) <br/>
+ * File: BaseRoleletpricepowimitService.java <br/>
+ * Class: com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitService <br/>
+ * Description: 角色让价权限表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-11-09 10:57:39 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseRoleletpricepowimitService extends MybatisBaseService<BaseRoleletpricepowimitMapper, BaseRoleletpricepowimit> {
+	private QueryWrapper<BaseRoleletpricepowimit> createQueryWrapper(BaseRoleletpricepowimitQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseRoleletpricepowimit> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseRoleletpricepowimitVo> listPageVo(PagerQuery<BaseRoleletpricepowimitQuery> pq) {
+		BaseRoleletpricepowimitQuery query = pq.getParams();
+		QueryWrapper<BaseRoleletpricepowimit> qw = createQueryWrapper(query);
+		IPage<BaseRoleletpricepowimit> page = PagerUtil.queryToPage(pq);
+		IPage<BaseRoleletpricepowimitVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseRoleletpricepowimitVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseRoleletpricepowimitDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseRoleletpricepowimitDto dto){
+		BaseRoleletpricepowimit entity = new BaseRoleletpricepowimit();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseRoleletpricepowimitDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseRoleletpricepowimit entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseRoleletpricepowimitDetailsVo fetchDetailsVoBySid(String sid){
+		BaseRoleletpricepowimit entity = fetchBySid(sid);
+		BaseRoleletpricepowimitDetailsVo vo = new BaseRoleletpricepowimitDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public List<BaseRoleletpricepowimitDetailsVo> fetchByMainSid(String sid) {
+		return baseMapper.fetchByMainSid(sid);
+	}
+
+	public void deleteByMainSid(String dtoSid) {
+		baseMapper.deleteByMainSid(dtoSid);
+	}
+}

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

@@ -474,4 +474,6 @@ public interface BaseVehicleMapper extends BaseMapper<BaseVehicle> {
     void updateConAndCostPrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callInOrgSid") String callInOrgSid);
 
     IPage<BaseVehicleCrmVo> vehicleCrmPageList(IPage<BaseVehicleCrmVo> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
+
+    IPage<BaseDiscountpackageGetVehVo> baseDisCountPackageGetVeh(IPage<BaseVehicle> page,@Param(Constants.WRAPPER) QueryWrapper<BaseVehicle> qw);
 }

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

@@ -1311,4 +1311,34 @@
         LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
         ${ew.customSqlSegment}
     </select>
+
+    <select id="baseDisCountPackageGetVeh" resultType="com.yxt.anrui.base.api.basevehicle.BaseDiscountpackageGetVehVo">
+        SELECT bv.sid as vehSid,
+        <!--车型-->
+        bv.modelSid as vehModelSid,
+        bv.modelName as vehModelName,
+        <!--车架号-->
+        bv.vinNo,
+        <!--厂家结算价 -->
+        bv.costPrice as manufactorSettlementPrice,
+        bv.priceDate,
+        bv.settlementStatus,
+        bv.settlementStatusValue,
+        bvc.manufactorSettlementPrice as guidedDKPrice,
+        bvc.guidedPrice as guidedQKPrice,
+        <!--品牌名称-->
+        bv.carBrandName as brandName,
+        <!--存放地点-->
+        bv.locationName
+        FROM base_vehicle bv
+        LEFT JOIN base_vehicle_model bvm ON bv.`modelSid` = bvm.`sid`
+        LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid`
+        LEFT JOIN base_vehmodel_config bvc
+        ON bvc.`modelSid` = bvm.`sid` AND bvc.`configurationItemsSid` = bmc.`sid` AND bvc.useOrgSid = bv.createOrgSid
+        LEFT JOIN base_vehicle_brand bvb
+        ON bvm.`carBrand` = bvb.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

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

@@ -825,6 +825,13 @@ public class BaseVehicleRest implements BaseVehicleFeign {
         return rb.success().setData(pv);
     }
 
+    @Override
+    public ResultBean<PagerVo<BaseDiscountpackageGetVehVo>> baseDisCountPackageGetVeh(PagerQuery<BaseDiscountpackageGetVehQuery> pq) {
+        ResultBean<PagerVo<BaseDiscountpackageGetVehVo>> rb = ResultBean.fireFail();
+        PagerVo<BaseDiscountpackageGetVehVo> pv = baseVehicleService.baseDisCountPackageGetVeh(pq);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean<Integer> selectCount(PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery) {
         return baseVehicleService.selectCount(pcBaseVehicleOrderCountQuery);

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

@@ -1,5 +1,7 @@
 package com.yxt.anrui.base.biz.basevehicle;
 
+import cn.hutool.core.date.DateTime;
+import cn.hutool.core.date.DateUnit;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -3184,4 +3186,75 @@ public class BaseVehicleService extends MybatisBaseService<BaseVehicleMapper, Ba
         baseMapper.updateConAndCostPrice(witPinMoney, vinNo, callInOrgSid);
     }
 
+    public PagerVo<BaseDiscountpackageGetVehVo> baseDisCountPackageGetVeh(PagerQuery<BaseDiscountpackageGetVehQuery> pq) {
+        IPage<BaseVehicle> page = PagerUtil.queryToPage(pq);
+        BaseDiscountpackageGetVehQuery params = pq.getParams();
+        QueryWrapper<BaseVehicle> qw = new QueryWrapper<>();
+        //品牌
+        if (StringUtils.isNotBlank(params.getBrandSid())) {
+            qw.eq("bvm.carBrand", params.getBrandSid());
+        }
+        //功能
+        if (StringUtils.isNotBlank(params.getVehicleType())) {
+            qw.eq("bvm.vehicleType", params.getVehicleType());
+        }
+        //系列
+        if (StringUtils.isNotBlank(params.getProductLine())) {
+            qw.eq("bvm.productLine", params.getProductLine());
+        }
+        //变速箱
+        if (StringUtils.isNotBlank(params.getGearboxType())) {
+            qw.eq("bvm.gearboxType", params.getGearboxType());
+        }
+        //驱动
+        if (StringUtils.isNotBlank(params.getDriveForm())) {
+            qw.eq("bvm.driveForm", params.getDriveForm());
+        }
+        //排放标准
+        if (StringUtils.isNotBlank(params.getEmissionStandard())) {
+            qw.eq("bvm.emissionStandard", params.getEmissionStandard());
+        }
+        //马力
+        if (StringUtils.isNotBlank(params.getPower())) {
+            qw.eq("bvm.power", params.getPower());
+        }
+        //燃料
+        if (StringUtils.isNotBlank(params.getFuelType())) {
+            qw.eq("bvm.fuelType", params.getFuelType());
+        }
+        //版本
+        if (StringUtils.isNotBlank(params.getVehicleVersion())) {
+            qw.eq("bvm.vehicleVersion", params.getVehicleVersion());
+        }
+        //车型
+        if (StringUtils.isNotBlank(params.getVehicleAlias())) {
+            qw.like("bvm.vehicleAlias", params.getVehicleAlias());
+        }
+        //快捷检索车型
+        if (StringUtils.isNotBlank(params.getModelName())) {
+            qw.like("bvm.modelName", params.getModelName());
+        }
+        qw.eq("bv.isDelete", 0);
+        qw.eq("bv.createOrgSid", params.getOrgSid());
+        qw.like("bvb.useOrg", params.getOrgSid());
+        qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode()));
+        if (params.getVehSids().size() > 0) {
+            qw.notIn("bv.sid", params.getVehSids());
+        }
+
+        IPage<BaseDiscountpackageGetVehVo> pagging = baseMapper.baseDisCountPackageGetVeh(page, qw);
+        for (BaseDiscountpackageGetVehVo record : pagging.getRecords()) {
+            //厂家库龄
+            if (record.getPriceDate() != null) {
+                Date priceDate = record.getPriceDate();
+                String today = DateUtil.today();
+                DateTime currentDate = DateUtil.parse(today);
+                int i = priceDate.compareTo(currentDate);
+                long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY);
+                record.setLibraryAge(betweenDay * i * -1);
+            }
+        }
+        PagerVo<BaseDiscountpackageGetVehVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

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

@@ -136,4 +136,6 @@ public interface BaseVehicleBrandMapper extends BaseMapper<BaseVehicleBrand> {
 
     @Select("select bvb.manufacturerSid from base_vehicle_brand bvb where bvb.sid = #{carBrandSid}")
     String selectByManufacturerSid(@Param("carBrandSid") String carBrandSid);
+
+    List<BaseVehicleBrand> selectByUseOrgSid(String sid);
 }

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

@@ -130,4 +130,10 @@
         select bb.* from base_vehicle_model bm left join base_vehicle_brand bb on bm.carBrand = bb.sid
         where bm.sid = #{modelSid}
     </select>
+
+    <select id="selectByUseOrgSid" resultType="com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand">
+        SELECT sid,brandName
+        FROM base_vehicle_brand
+        WHERE useOrg LIKE #{%sid%}
+    </select>
 </mapper>

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

@@ -224,9 +224,9 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
     public List<BaseVehicleBrandDictionariesVo> selectAppListByUserSid(VehicleBrandQuery vehicleBrandQuery) {
         String userSid = vehicleBrandQuery.getUserSid();
         String orgPath = vehicleBrandQuery.getOrgPath();
-        if(StringUtils.isBlank(orgPath)){
+        if (StringUtils.isBlank(orgPath)) {
             orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData();
-        }else{
+        } else {
             orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
         List<BaseVehicleBrandDictionariesVo> list = baseMapper.selectAppListByUserSid(orgPath);
@@ -252,4 +252,8 @@ public class BaseVehicleBrandService extends MybatisBaseService<BaseVehicleBrand
     public String selectByManufacturerSid(String carBrandSid) {
         return baseMapper.selectByManufacturerSid(carBrandSid);
     }
+
+    public List<BaseVehicleBrand> selectByUseOrgSid(String sid) {
+        return baseMapper.selectByUseOrgSid(sid);
+    }
 }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -2073,10 +2073,18 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
         }
         //验证总订金是否正确
-        ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(sid);
+        //结转金额是否超过订金合计、需补交金额是否是负数
+        BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid);
+        if(busSalesOrderDeposit.getMakeUpDeposit() != null){
+            if(busSalesOrderDeposit.getMakeUpDeposit().compareTo(new BigDecimal("0"))<0){
+                return rb.setMsg("订金信息存在错误，请检查");
+            }
+        }
+
+       /* ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(sid);
         if (!resultBean.getSuccess()) {
             return rb.setMsg(resultBean.getMsg());
-        }
+        }*/
         return rb.success();
     }
 

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

@@ -98,5 +98,5 @@ public interface BusSalesOrderDepositMapper extends BaseMapper<BusSalesOrderDepo
 
     List<String> selectByTotalValue(String sid);
 
-    int updateBySalesOrderSid(@Param("depositSum") BigDecimal depositSum, @Param("orderSid") String salesOrderSid);
+    int updateBySalesOrderSid(@Param("depositSum") BigDecimal depositSum, @Param("orderSid") String salesOrderSid,@Param("bigDecimalSum")BigDecimal bigDecimalSum);
 }

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

@@ -84,7 +84,8 @@
 
     <update id="updateBySalesOrderSid">
         update bus_sales_order_deposit
-        set depositAll = #{depositSum}
+        set depositAll = #{depositSum},
+        makeUpDeposit = #{bigDecimalSum}
         where salesOrderSid = #{orderSid}
     </update>
 </mapper>

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

@@ -373,7 +373,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
      * @param salesOrderSid 销售订单sid
      * @return
      */
-    public int updateBySalesOrderSid(BigDecimal depositSum, String salesOrderSid) {
-        return baseMapper.updateBySalesOrderSid(depositSum, salesOrderSid);
+    public int updateBySalesOrderSid(BigDecimal depositSum, String salesOrderSid,BigDecimal bigDecimalSum) {
+        return baseMapper.updateBySalesOrderSid(depositSum, salesOrderSid,bigDecimalSum);
     }
 }

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

@@ -28,6 +28,7 @@ package com.yxt.anrui.buscenter.biz.bussalesordermodel;
 import cn.hutool.core.bean.BeanUtil;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
 import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModelFeign;
+import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.AppOrderInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo;
@@ -41,6 +42,7 @@ import com.yxt.anrui.buscenter.api.bussalesordermodel.app.AppOrderInfoDto;
 import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.app.AppBusSalesOrderVehicleDto;
 import com.yxt.anrui.buscenter.api.bussalesvehicleorder.app.AppBusSalesVehicleOrderDto;
+import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.anrui.buscenter.biz.bussalesordermakeup.BusSalesOrderMakeupService;
@@ -54,6 +56,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -86,6 +89,8 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
     private BaseVehicleModelFeign baseVehicleModelFeign;
     @Autowired
     private BusSalesOrderDepositService busSalesOrderDepositService;
+    @Autowired
+    private BusDepositFictitiousService busDepositFictitiousService;
 
 
     public void saveModel(BusSalesOrderModelDto busSalesOrderModelDto, String sid) {
@@ -246,8 +251,20 @@ public class BusSalesOrderModelService extends MybatisBaseService<BusSalesOrderM
             if (StringUtils.isNotBlank(depositInfo.getDeposit())) {
                 depositSum = new BigDecimal(depositInfo.getDeposit()).multiply(new BigDecimal(num));
             }
+            BigDecimal bigDecimalSum = new BigDecimal("0");
+            if (StringUtils.isNotBlank(depositInfo.getDepositTypeKey())) {
+                if ("02".equals(depositInfo.getDepositTypeKey())) {
+                    //计算总的结转金额
+                    List<BusDepositFictitiousDetailsVo> depositFictitiousList = busDepositFictitiousService.detailsList(depositInfo.getSid());
+                    depositFictitiousList.removeAll(Collections.singleton(null));
+                    for (BusDepositFictitiousDetailsVo vo : depositFictitiousList){
+                        bigDecimalSum = bigDecimalSum.add(new BigDecimal(vo.getPrice()));
+                    }
+                    bigDecimalSum = depositSum.subtract(bigDecimalSum);
+                }
+            }
             //更新订金的订金合计
-            busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid);
+            busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid,bigDecimalSum);
 
         }
         return rb.success().setMsg("成功");

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -9,7 +9,7 @@ public enum ProcDefEnum {
     ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"),
     ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"),
 //    CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"),
-    SALESPOLICY("销售政策审批流程", "sales_policy_oxeeyzhr:1:247508"),
+    SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//测试销售政策流程定义id
     FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"),
 //    ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"),
     BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:2:665066"), //本地

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml

@@ -23,7 +23,9 @@
 
     <select id="getCarInventoryList"
             resultType="com.yxt.anrui.scm.api.scmvehiclepatrolinspection.AppScmVehiclePatrolinspectionPageVo">
-        SELECT sid,
+        SELECT
+        id,
+        sid,
         vinNo as vin,
         mainSid,
         location as warehouse,

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionService.java

@@ -294,7 +294,6 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
             }
             if ("000".equals(pagerQuery.getParams().getState())) {
                 qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
-                qw.eq("svp.isDelete", 0);
             }
             if ("001".equals(pagerQuery.getParams().getState())) {
                 qw.eq("svp.patrolInspectionStateKey", pagerQuery.getParams().getState());
@@ -324,6 +323,26 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
                 );
         AppScmVehiclePatrolinspectionPageQuery params = pagerQuery.getParams();
         IPage<AppScmVehiclePatrolinspectionPageVo> iPage = baseMapper.getCarInventoryList(page, qw, params.getNames());
+        for (AppScmVehiclePatrolinspectionPageVo record : iPage.getRecords()) {
+            List<ScmVehicleStayPatrolinspectionVo> scmVehicleStayPatrolinspectionVos = baseMapper.selPatrolinspection(record.getVin(), record.getId(), orgPath);
+            if (scmVehicleStayPatrolinspectionVos.size() > 0) {
+                for (ScmVehicleStayPatrolinspectionVo scmVehicleStayPatrolinspectionVo : scmVehicleStayPatrolinspectionVos) {
+                    if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate() == null) {
+                        record.setNewInspectionDate("无");
+                    } else {
+                        record.setNewInspectionDate(scmVehicleStayPatrolinspectionVo.getPatrolInspectionDate());
+                    }
+                    if (scmVehicleStayPatrolinspectionVo.getPatrolInspectionName() == null) {
+                        record.setNewInspectionName("无");
+                    } else {
+                        record.setNewInspectionName(scmVehicleStayPatrolinspectionVo.getPatrolInspectionName());
+                    }
+                }
+            } else {
+                record.setNewInspectionDate("无");
+                record.setNewInspectionName("无");
+            }
+        }
         return iPage;
     }
 
@@ -386,7 +405,7 @@ public class ScmVehiclePatrolinspectionService extends MybatisBaseService<ScmVeh
         return baseMapper.selectByMainSidAndVinNo(sid, vinNo);
     }
 
-    public List<ScmVehiclePatrolinspection>  getDetailedsByMainSid(String sid,String vinNo) {
-        return baseMapper.getDetailedsByMainSid(sid,vinNo);
+    public List<ScmVehiclePatrolinspection> getDetailedsByMainSid(String sid, String vinNo) {
+        return baseMapper.getDetailedsByMainSid(sid, vinNo);
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspectionsheet/ScmVehiclePatrolinspectionsheetService.java

@@ -250,12 +250,13 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
         String oneValue = "问题未解决";
         String newDate = new SimpleDateFormat("yyyy-MM-dd").format(new Date());
         ScmVehiclePatrolinspectionsheet scmVehiclePatrolinspectionsheet = new ScmVehiclePatrolinspectionsheet();
-        String orgPath = dto.getOrgPath();
         SysUserVo sysUserVo = sysUserFeign.fetchBySid(dto.getUserSid()).getData();
+        String useOrgSid = "";
+        String orgPath = dto.getOrgPath();
         if (StringUtils.isBlank(orgPath)) {
-            orgPath = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
+            useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(dto.getUserSid()).getData();
         } else {
-            orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            useOrgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
         }
 
         int counts = baseMapper.selectByMainSidAndVinNo(dto.getMainSid(), dto.getVinNo());
@@ -279,50 +280,91 @@ public class ScmVehiclePatrolinspectionsheetService extends MybatisBaseService<S
                 monthVoList = scmVehPatrolinspectionmonthService.selectListAll();
                 scmVehPatrolinspectionmonthVo = monthVoList.get(0);
             }
-            List<AppScmVehiclePatrolinspectionPageVo> list = scmVehiclePatrolinspectionService.selectByVinNo(dto.getVinNo(), orgPath);
-            if (list.size() > 0) {
-                String id = list.get(0).getId();
-                String mainSid = list.get(0).getSid();
-                /*if (!"000".equals(list.get(0).getStateKey()) && !"002".equals(list.get(0).getStateKey())) {
-                    scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
-                    int count = baseMapper.selectByMainSidNum(mainSid);
-                    if (count > 0) {
-                        baseMapper.deleteByMainSid(mainSid);
-                    }
-                }*/
-                if ("000".equals(list.get(0).getStateKey())) {
-                    scmVehiclePatrolinspectionService.deleteByVinNo(dto.getVinNo(), id);
-                    int count = baseMapper.selectByMainSidNum(mainSid);
+            ScmVehiclePatrolinspection scmVehiclePatrolinspection = null;
+            List<ScmVehiclePatrolinspection> scmVehiclePatrolinspections = scmVehiclePatrolinspectionService.getDetailedsByMainSid(scmVehPatrolinspectionmonthVo.getSid(), dto.getVinNo());
+            if (scmVehiclePatrolinspections.size() > 0) {
+                scmVehiclePatrolinspection = scmVehiclePatrolinspections.get(0);
+            }
+            if (scmVehiclePatrolinspection == null) {
+                scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
+                scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
+                scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
+                scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
+                scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
+                scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
+                scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
+                scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+                scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
+                scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                scmVehiclePatrolinspection.setPushState(dto.getPushState());
+                scmVehiclePatrolinspection.setState(0);
+                scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
+
+                BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
+                scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
+                scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
+                scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+                scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
+                scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
+                scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
+                scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
+                scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
+                save(scmVehiclePatrolinspectionsheet);
+            } else {
+                if ("002".equals(scmVehiclePatrolinspection.getPatrolInspectionStateKey()) || "003".equals(scmVehiclePatrolinspection.getPatrolInspectionStateKey())) {
+                    scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
+                    scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
+                    scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
+                    scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
+                    scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
+                    scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
+                    scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
+                    scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+                    scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
+                    scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspection.setPushState(dto.getPushState());
+                    scmVehiclePatrolinspection.setState(0);
+                    scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
+
+                    BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
+                    scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
+                    scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
+                    scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
+                    scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
+                    scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
+                    scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
+                    save(scmVehiclePatrolinspectionsheet);
+                } else {
+                    scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
+                    scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
+                    scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
+                    scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
+                    scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
+                    scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
+                    scmVehiclePatrolinspection.setCreateOrgSid(useOrgSid);
+                    scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
+                    scmVehiclePatrolinspection.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspection.setPushState(dto.getPushState());
+                    scmVehiclePatrolinspection.setState(1);
+                    int count = baseMapper.selectByMainSidNum(scmVehiclePatrolinspection.getSid());
                     if (count > 0) {
-                        baseMapper.deleteByMainSid(mainSid);
+                        baseMapper.deleteByMainSid(scmVehiclePatrolinspection.getSid());
                     }
+                    scmVehiclePatrolinspectionService.updateById(scmVehiclePatrolinspection);
+                    BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
+                    scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
+                    scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
+                    scmVehiclePatrolinspectionsheet.setCreateOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
+                    scmVehiclePatrolinspectionsheet.setUseOrgSid(useOrgSid);
+                    scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
+                    scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
+                    scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
+                    save(scmVehiclePatrolinspectionsheet);
                 }
             }
-            ScmVehiclePatrolinspection scmVehiclePatrolinspection = new ScmVehiclePatrolinspection();
-            scmVehiclePatrolinspection.setVinNo(dto.getVinNo());
-            scmVehiclePatrolinspection.setVehicleSid(dto.getVehicleSid());
-            scmVehiclePatrolinspection.setMainSid(scmVehPatrolinspectionmonthVo.getSid());
-            scmVehiclePatrolinspection.setLocation(dto.getWarehouse());
-            scmVehiclePatrolinspection.setLocationSid(dto.getWarehouseSid());
-            scmVehiclePatrolinspection.setPatrolInspectionState(oneValue);
-            scmVehiclePatrolinspection.setPatrolInspectionStateKey(oneKey);
-            scmVehiclePatrolinspection.setCreateOrgSid(orgPath);
-            scmVehiclePatrolinspection.setCreateBySid(dto.getUserSid());
-//            scmVehiclePatrolinspection.setState(0);
-            scmVehiclePatrolinspection.setState(1);
-            scmVehiclePatrolinspection.setUseOrgSid(orgPath);
-            scmVehiclePatrolinspectionService.save(scmVehiclePatrolinspection);
-
-            BeanUtil.copyProperties(dto, scmVehiclePatrolinspectionsheet, "sid");
-            scmVehiclePatrolinspectionsheet.setDutyName(dto.getLiableName());
-            scmVehiclePatrolinspectionsheet.setDutySid(dto.getLiableSid());
-            scmVehiclePatrolinspectionsheet.setCreateOrgSid(orgPath);
-            scmVehiclePatrolinspectionsheet.setCreateBySid(dto.getUserSid());
-            scmVehiclePatrolinspectionsheet.setUseOrgSid(orgPath);
-            scmVehiclePatrolinspectionsheet.setMainSid(scmVehiclePatrolinspection.getSid());
-            scmVehiclePatrolinspectionsheet.setModel(dto.getModel());
-            scmVehiclePatrolinspectionsheet.setModelSid(dto.getModelSid());
-            save(scmVehiclePatrolinspectionsheet);
             scmFileService.deleteByLinkSidAndType(scmVehiclePatrolinspectionsheet.getSid(), type1);
             List<String> images = dto.getImages();
             for (String s : images) {

doc/databases/bus-center_tables.sql

@@ -584,3 +584,119 @@ CREATE TABLE `bus_sales_order_submit`
 ) ENGINE = INNODB
   DEFAULT CHARSET = utf8 COMMENT ='销售订单-订单提交时补充的返利信息';
 
+
+DROP TABLE IF EXISTS `bus_handover_wait`;
+CREATE TABLE `bus_handover_wait`
+(
+    `id`            int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`           varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`   int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`      int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`         int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`      int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注：返利备注',
+    `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `contractNo`    VARCHAR(64)          DEFAULT NULL COMMENT '合同编号',
+    `payTypeKey`    varchar(500)         DEFAULT NULL COMMENT '付款方式key',
+    `payTypeValue`  varchar(500)         DEFAULT NULL COMMENT '付款方式value',
+    `customerName`  varchar(64)          DEFAULT NULL COMMENT '客户名称',
+    `customerSid`   varchar(64)          DEFAULT NULL COMMENT '客户sid',
+    `vinNo`         varchar(64)          DEFAULT NULL COMMENT '车架号',
+    `vinSid`        varchar(64)          DEFAULT NULL COMMENT '车辆sid',
+    `payStateKey`   varchar(64)          DEFAULT NULL COMMENT '付款状态key',
+    `payStateValue` varchar(64)          DEFAULT NULL COMMENT '付款状态value',
+    `modelSid`      varchar(64)          DEFAULT NULL COMMENT '车型sid',
+    `modelName`     varchar(255)         DEFAULT NULL COMMENT '车型别名',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='待交车车辆';
+
+DROP TABLE IF EXISTS `bus_handover`;
+CREATE TABLE `bus_handover`
+(
+    `id`                 int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`                varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`        int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`         timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`           int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`              int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`           int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`            varchar(255)         DEFAULT NULL COMMENT '备注：返利备注',
+    `createBySid`        varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`        varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `contractNo`         VARCHAR(64)          DEFAULT NULL COMMENT '合同编号',
+    `orderSid`           varchar(500)         DEFAULT NULL COMMENT '订单sid',
+    `staffSid`           varchar(500)         DEFAULT NULL COMMENT '业务员sid',
+    `customerName`       varchar(64)          DEFAULT NULL COMMENT '客户名称',
+    `customerSid`        varchar(64)          DEFAULT NULL COMMENT '客户sid',
+    `idNo`               varchar(64)          DEFAULT NULL COMMENT '身份证号',
+    `mobile`             varchar(64)          DEFAULT NULL COMMENT '联系电话',
+    `deliverDate`        varchar(64)          DEFAULT NULL COMMENT '交付日期',
+    `deliverAddress`     varchar(64)          DEFAULT NULL COMMENT '交付地点',
+    `recipient`          varchar(64)          DEFAULT NULL COMMENT '接收人',
+    `handoverStateKey`   varchar(64)          DEFAULT NULL COMMENT '交车状态key',
+    `handoverStateValue` varchar(64)          DEFAULT NULL COMMENT '交车状态value',
+    `locationCode`       varchar(255)         DEFAULT NULL COMMENT '交车定位经纬度',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='交车确认单';
+
+DROP TABLE IF EXISTS `bus_handover_items`;
+CREATE TABLE `bus_handover_items`
+(
+    `id`            int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`           varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion`   int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`    timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`      int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`         int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`      int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`       varchar(255)         DEFAULT NULL COMMENT '备注：返利备注',
+    `createBySid`   varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid`   varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `handoverSid`   VARCHAR(64)          DEFAULT NULL COMMENT '交车确认单sid',
+    `modelSid`      varchar(500)         DEFAULT NULL COMMENT '车型sid',
+    `modelName`     varchar(500)         DEFAULT NULL COMMENT '车型别名',
+    `vinSid`        varchar(64)          DEFAULT NULL COMMENT '车辆sid',
+    `vinNo`         varchar(64)          DEFAULT NULL COMMENT '车架号',
+    `itemKey`       varchar(255)         DEFAULT NULL COMMENT '是否包含（发票、合格证、申请
+表、一致性证书、保修手册、说明书、环保清单、驾驶员卡、气瓶产品质量证明书、）',
+    `handoverPhoto` text                 DEFAULT NULL COMMENT '车辆交车照片',
+    `policyPhoto`   text                 DEFAULT NULL COMMENT '保单照片',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='交车车辆及车辆交付清单';
+
+DROP TABLE IF EXISTS `buscenter_file`;
+CREATE TABLE `buscenter_file`
+(
+    `id`          int(32)     NOT NULL AUTO_INCREMENT COMMENT 'id',
+    `sid`         varchar(64) NOT NULL COMMENT 'sid',
+    `lockVersion` int(32)              DEFAULT '0' COMMENT '版本锁',
+    `createTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
+    `modifyTime`  timestamp   NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '修改时间',
+    `isEnable`    int(32)              DEFAULT '1' COMMENT '是否可用：1可用，0不可用',
+    `state`       int(32)              DEFAULT '1' COMMENT '状态',
+    `isDelete`    int(32)              DEFAULT '0' COMMENT '是否删除：0未删除，1已删除',
+    `remarks`     varchar(255)         DEFAULT NULL COMMENT '备注：返利备注',
+    `createBySid` varchar(64)          DEFAULT NULL COMMENT '创建人sid',
+    `updateBySid` varchar(64)          DEFAULT NULL COMMENT '修改人sid',
+    `linkSid`     VARCHAR(64)          DEFAULT NULL COMMENT '关联业务的sid',
+    `fileType`    varchar(255)         DEFAULT NULL COMMENT '文件类型',
+    `attachType`  varchar(255)         DEFAULT NULL COMMENT '附件类型',
+    `fileName`    varchar(64)          DEFAULT NULL COMMENT '文件名',
+    `fileSize`    varchar(64)          DEFAULT NULL COMMENT '文件大小',
+    `filePath`    varchar(500)         DEFAULT NULL COMMENT '文件路径',
+    PRIMARY KEY (`id`),
+    KEY `id` (`id`)
+) ENGINE = INNODB
+  DEFAULT CHARSET = utf8 COMMENT ='销售附件表';
+