问题修改，接口开发

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

@@ -0,0 +1,19 @@
+package com.yxt.anrui.base.api.basediscountpackage;
+
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppDiscountpackageListVo implements Vo {
+
+    @ApiModelProperty("优惠包名称")
+    private String projectName;
+
+    @ApiModelProperty("优惠包价值")
+    private String projectCost;
+
+    @ApiModelProperty("优惠项目说明")
+    private String discountExplain;
+}

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

@@ -77,9 +77,10 @@ public interface BaseDiscountpackageFeign {
     @GetMapping("/selectAppLableListByUserSid")
     ResultBean<List<AppBaseLableListVo>> selectAppListByUserSid(@SpringQueryMap AppLableQuery appLableQuery);
 
-    @ApiOperation("移动端-获取优惠包列表")
+    @ApiOperation("移动端-获取优惠包信息")
-    @PostMapping("/getDiscountManageApplyList")
+    @GetMapping("/selectAppDiscountpackageListByUserSid")
-    ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(@RequestBody PagerQuery<AppDiscountpackageQuery> pq);
+    ResultBean<List<AppDiscountpackageListVo>> selectAppDiscountpackageListByUserSid(@SpringQueryMap AppLableQuery appLableQuery);
+
     /*****************************销售政策流程****************************************************/
 
     @ApiOperation("提交销售政策流程")

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

@@ -78,7 +78,7 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig
     }
 
     @Override
-    public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
+    public ResultBean<List<AppDiscountpackageListVo>> selectAppDiscountpackageListByUserSid(AppLableQuery appLableQuery) {
         return null;
     }
 

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDetailsVo.java

@@ -0,0 +1,103 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+
+import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDetailsVo;
+import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDto;
+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: BaseDiscountpackageApplyVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo <br/>
+ * Description: 优惠包申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 视图数据详情", description = "优惠包申请 视图数据详情")
+public class AppDiscountpackageApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("合同编号")
+    private String contractId; // 合同编号
+	@ApiModelProperty("申请人")
+    private String applyName; // 申请人
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+	@ApiModelProperty("车型名称")
+    private String model; // 车型名称
+	@ApiModelProperty("台数")
+    private String number; // 台数
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+	@ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("优惠包列表")
+    private List<AppDiscountpackagelistDetailsVo> appDiscountpackagelists; // 优惠包列表
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageApplyDto.java

@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+
+import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * Project: anrui-base(优惠包申请) <br/>
+ * File: BaseDiscountpackageApplyDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyDto <br/>
+ * Description: 优惠包申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 数据传输对象", description = "优惠包申请 数据传输对象")
+public class AppDiscountpackageApplyDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+	@ApiModelProperty("合同编号")
+    private String contractId; // 合同编号
+	@ApiModelProperty("申请人")
+    private String applyName; // 申请人
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+	@ApiModelProperty("车型名称")
+    private String model; // 车型名称
+	@ApiModelProperty("台数")
+    private String number; // 台数
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+	@ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("优惠包列表")
+    private List<AppDiscountpackagelistDto> discountPackageList; // 优惠包列表
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppDiscountpackageQuery implements Query {
+
+    @ApiModelProperty("userSid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+    @ApiModelProperty("合同编号 客户名称")
+    private String names;
+    @ApiModelProperty("申请日期")
+    private String date;
+    @ApiModelProperty("1待办 2已办")
+    private String type;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/AppDiscountpackageVo.java

@@ -0,0 +1,49 @@
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "优惠包 视图数据对象", description = "优惠包 视图数据对象")
+@Data
+public class AppDiscountpackageVo implements Vo {
+
+    @ApiModelProperty("优惠包sid")
+    private String sid;
+
+    @ApiModelProperty("合同编号")
+    private String contractId;
+
+    @ApiModelProperty("申请人")
+    private String applyName;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+
+    @ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn;
+
+    @ApiModelProperty("车型名称")
+    private String model;
+
+    @ApiModelProperty("台数")
+    private String number;
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("成交价")
+    private String price;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApply.java

@@ -0,0 +1,97 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+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: BaseDiscountpackageApply.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApply <br/>
+ * Description: 优惠包申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请", description = "优惠包申请")
+@TableName("base_discountpackage_apply")
+public class BaseDiscountpackageApply extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("合同编号")
+    private String contractId; // 合同编号
+	@ApiModelProperty("申请人")
+    private String applyName; // 申请人
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+	@ApiModelProperty("车型名称")
+    private String model; // 车型名称
+	@ApiModelProperty("台数")
+    private String number; // 台数
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+	@ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("成交价")
+    private String price;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDetailsVo.java

@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+
+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: BaseDiscountpackageApplyVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo <br/>
+ * Description: 优惠包申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 视图数据详情", description = "优惠包申请 视图数据详情")
+public class BaseDiscountpackageApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("合同编号")
+    private String contractId; // 合同编号
+	@ApiModelProperty("申请人")
+    private String applyName; // 申请人
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+	@ApiModelProperty("车型名称")
+    private String model; // 车型名称
+	@ApiModelProperty("台数")
+    private String number; // 台数
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+	@ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("成交价")
+    private String price;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyDto.java

@@ -0,0 +1,98 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+
+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: BaseDiscountpackageApplyDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyDto <br/>
+ * Description: 优惠包申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 数据传输对象", description = "优惠包申请 数据传输对象")
+public class BaseDiscountpackageApplyDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("合同编号")
+    private String contractId; // 合同编号
+	@ApiModelProperty("申请人")
+    private String applyName; // 申请人
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+	@ApiModelProperty("车型名称")
+    private String model; // 车型名称
+	@ApiModelProperty("台数")
+    private String number; // 台数
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+	@ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("成交价")
+    private String price;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeign.java

@@ -0,0 +1,137 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery;
+import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto;
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
+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 io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+import java.util.List;
+
+/**
+ * Project: anrui-base(优惠包申请) <br/>
+ * File: BaseDiscountpackageApplyFeign.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyFeign <br/>
+ * Description: 优惠包申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "优惠包申请")
+@FeignClient(
+        contextId = "anrui-base-BaseDiscountpackageApply",
+        name = "anrui-base",
+        path = "v1/basediscountpackageapply",
+        fallback = BaseDiscountpackageApplyFeignFallback.class)
+public interface BaseDiscountpackageApplyFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BaseDiscountpackageApplyVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackageApplyQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BaseDiscountpackageApplyDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BaseDiscountpackageApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    /**************************App接口************************************/
+
+    @ApiOperation("移动端-获取优惠包列表")
+    @PostMapping("/getDiscountManageApplyList")
+    ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(@RequestBody PagerQuery<AppDiscountpackageQuery> pq);
+
+    @ApiOperation("移动端-优惠包新增或修改")
+    @PostMapping("/saveDiscountPackageApplyInfo")
+    @ResponseBody
+    public ResultBean saveDiscountPackageApplyInfo(@RequestBody AppDiscountpackageApplyDto dto);
+
+    @ApiOperation("移动端-优惠包初始化回显")
+    @GetMapping("/getDiscountPackageApplyInfo")
+    @ResponseBody
+    public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(@RequestParam("sid") String sid);
+
+    /**************************流程接口************************************/
+
+    @ApiOperation("提交入账申请")
+    @PostMapping("/submitRecordApplication")
+    public ResultBean submitRecordApplication(@RequestBody @Valid SubmitBaseDiscountpackageApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PostMapping("/complete")
+    public ResultBean complete(@Valid @RequestBody BaseDiscountpackageApplyCompleteDto dto);
+
+    @ApiOperation(value = "撤回流程")
+    @PostMapping(value = "/revokeProcess")
+    public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "驳回任务")
+    @PostMapping(value = "/reject")
+    public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "终止任务")
+    @PostMapping(value = "/breakProcess")
+    public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "流程历史流转记录")
+    @GetMapping(value = "/task/flowRecord/{procInsId}/{deployId}")
+    public ResultBean flowRecord(@ApiParam(value = "流程实例id") @PathVariable(value = "procInsId") String procInsId);
+
+    @ApiOperation(value = "获取下一个环节")
+    @GetMapping(value = "/getNextNodesForSubmit")
+    ResultBean getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query);
+
+    @ApiOperation(value = "获取上一个环节")
+    @GetMapping(value = "/getPreviousNodesForReject")
+    ResultBean getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query);
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyFeignFallback.java

@@ -0,0 +1,133 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery;
+import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto;
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
+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: BaseDiscountpackageApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyFeignFallback <br/>
+ * Description: 优惠包申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseDiscountpackageApplyFeignFallback implements BaseDiscountpackageApplyFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseDiscountpackageApplyVo>> listPage(PagerQuery<BaseDiscountpackageApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basediscountpackageapply/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseDiscountpackageApplyDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basediscountpackageapply/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basediscountpackageapply/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseDiscountpackageApplyDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basediscountpackageapply/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
+		return null;
+	}
+
+	@Override
+	public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
+		return null;
+	}
+
+	@Override
+	public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+		return null;
+	}
+
+	@Override
+	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+		return null;
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId) {
+		return null;
+	}
+
+	@Override
+	public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
+		return null;
+	}
+
+	@Override
+	public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
+		return null;
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyQuery.java

@@ -0,0 +1,87 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+
+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: BaseDiscountpackageApplyQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyQuery <br/>
+ * Description: 优惠包申请 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 查询条件", description = "优惠包申请 查询条件")
+public class BaseDiscountpackageApplyQuery implements Query {
+
+	@ApiModelProperty("合同编号")
+    private String contractId; // 合同编号
+	@ApiModelProperty("申请人")
+    private String applyName; // 申请人
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+	@ApiModelProperty("车型名称")
+    private String model; // 车型名称
+	@ApiModelProperty("台数")
+    private String number; // 台数
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+	@ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/BaseDiscountpackageApplyVo.java

@@ -0,0 +1,89 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackageapply;
+
+
+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: BaseDiscountpackageApplyVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo <br/>
+ * Description: 优惠包申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 视图数据对象", description = "优惠包申请 视图数据对象")
+public class BaseDiscountpackageApplyVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("合同编号")
+    private String contractId; // 合同编号
+	@ApiModelProperty("申请人")
+    private String applyName; // 申请人
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+	@ApiModelProperty("车型名称")
+    private String model; // 车型名称
+	@ApiModelProperty("台数")
+    private String number; // 台数
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+	@ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyCompleteDto.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.base.api.basediscountpackageapply.flow;
+
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class BaseDiscountpackageApplyCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "参数错误：orgSidPath")
+    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;
+    @ApiModelProperty("调账车辆列表")
+    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageapply/flow/BaseDiscountpackageApplyTaskQuery.java

@@ -0,0 +1,56 @@
+package com.yxt.anrui.base.api.basediscountpackageapply.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 BaseDiscountpackageApplyTaskQuery 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/basediscountpackageapply/flow/GetNodeQuery.java

@@ -0,0 +1,29 @@
+package com.yxt.anrui.base.api.basediscountpackageapply.flow;
+
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+
+/**
+ * @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 = "调账申请sid")
+    private String sid;
+
+    @ApiModelProperty("调账车辆列表")
+    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
+}

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

@@ -0,0 +1,25 @@
+package com.yxt.anrui.base.api.basediscountpackageapply.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/basediscountpackageapply/flow/SubmitBaseDiscountpackageApplyDto.java

@@ -0,0 +1,21 @@
+package com.yxt.anrui.base.api.basediscountpackageapply.flow;
+
+import com.yxt.anrui.base.api.baseaccadjapply.BaseAccadjApplyDto;
+import com.yxt.anrui.base.api.basediscountpackageapply.AppDiscountpackageApplyDto;
+import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyDto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitBaseDiscountpackageApplyDto extends AppDiscountpackageApplyDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/AppDiscountpackagelistDetailsVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackagelist;
+
+
+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: BaseDiscountpackagelistVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo <br/>
+ * Description: 优惠包申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 视图数据详情", description = "优惠包申请 视图数据详情")
+public class AppDiscountpackagelistDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("价值")
+    private String price; // 价值
+	@ApiModelProperty("数量")
+    private String number; // 数量
+	@ApiModelProperty("说明")
+    private String explain; // 说明
+	@ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+	@ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+	@ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/AppDiscountpackagelistDto.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackagelist;
+
+
+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: BaseDiscountpackagelistDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto <br/>
+ * Description: 优惠包申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 数据传输对象", description = "优惠包申请 数据传输对象")
+public class AppDiscountpackagelistDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("价值")
+    private String price; // 价值
+	@ApiModelProperty("数量")
+    private String number; // 数量
+	@ApiModelProperty("说明")
+    private String explain; // 说明
+	@ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+	@ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+	@ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelist.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackagelist;
+
+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: BaseDiscountpackagelist.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelist <br/>
+ * Description: 优惠包申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请", description = "优惠包申请")
+@TableName("base_discountpackagelist")
+public class BaseDiscountpackagelist extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("价值")
+    private String price; // 价值
+	@ApiModelProperty("数量")
+    private String number; // 数量
+	@ApiModelProperty("说明")
+    private String explain; // 说明
+	@ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+	@ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+	@ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistDetailsVo.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackagelist;
+
+
+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: BaseDiscountpackagelistVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo <br/>
+ * Description: 优惠包申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 视图数据详情", description = "优惠包申请 视图数据详情")
+public class BaseDiscountpackagelistDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("价值")
+    private String price; // 价值
+	@ApiModelProperty("数量")
+    private String number; // 数量
+	@ApiModelProperty("说明")
+    private String explain; // 说明
+	@ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+	@ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+	@ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistDto.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackagelist;
+
+
+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: BaseDiscountpackagelistDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto <br/>
+ * Description: 优惠包申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 数据传输对象", description = "优惠包申请 数据传输对象")
+public class BaseDiscountpackagelistDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("价值")
+    private String price; // 价值
+	@ApiModelProperty("数量")
+    private String number; // 数量
+	@ApiModelProperty("说明")
+    private String explain; // 说明
+	@ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+	@ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+	@ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeign.java

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

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistFeignFallback.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackagelist;
+
+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: BaseDiscountpackagelistFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistFeignFallback <br/>
+ * Description: 优惠包申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BaseDiscountpackagelistFeignFallback implements BaseDiscountpackagelistFeign {
+
+	@Override
+	public ResultBean<PagerVo<BaseDiscountpackagelistVo>> listPage(PagerQuery<BaseDiscountpackagelistQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basediscountpackagelist/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BaseDiscountpackagelistDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basediscountpackagelist/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-base/basediscountpackagelist/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BaseDiscountpackagelistDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-base/basediscountpackagelist/fetchDetailsBySid无法访问");
+	}
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistQuery.java

@@ -0,0 +1,65 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackagelist;
+
+
+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: BaseDiscountpackagelistQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistQuery <br/>
+ * Description: 优惠包申请 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 查询条件", description = "优惠包申请 查询条件")
+public class BaseDiscountpackagelistQuery implements Query {
+
+	@ApiModelProperty("价值")
+    private String price; // 价值
+	@ApiModelProperty("数量")
+    private String number; // 数量
+	@ApiModelProperty("说明")
+    private String explain; // 说明
+	@ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+	@ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+	@ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackagelist/BaseDiscountpackagelistVo.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.api.basediscountpackagelist;
+
+
+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: BaseDiscountpackagelistVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo <br/>
+ * Description: 优惠包申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 视图数据对象", description = "优惠包申请 视图数据对象")
+public class BaseDiscountpackagelistVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("价值")
+    private String price; // 价值
+	@ApiModelProperty("数量")
+    private String number; // 数量
+	@ApiModelProperty("说明")
+    private String explain; // 说明
+	@ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+	@ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+	@ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractListQuery.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.base.api.commoncontract;
+
+
+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: CommonContractQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.commoncontract.CommonContractQuery <br/>
+ * Description: 合同表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-10-12 14:02:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "合同表 查询条件", description = "合同表 查询条件")
+@Data
+public class AppCommonContractListQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+	@ApiModelProperty("组织路径")
+    private String orgPath;
+    
+	@ApiModelProperty("合同编号/客户名称")
+    private String names;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/AppCommonContractListVo.java

@@ -0,0 +1,35 @@
+package com.yxt.anrui.base.api.commoncontract;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/10/21
+ */
+@Data
+public class AppCommonContractListVo implements Vo {
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("车型名称")
+    private String model;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("车辆台数")
+    private String carNum;
+    @ApiModelProperty("成交价")
+    private String price;
+}

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeign.java

@@ -105,6 +105,10 @@ public interface CommonContractFeign {
     @PostMapping("/delAppBusOrderContractByOrderSid")
     public ResultBean delAppBusOrderContractByOrderSid(@RequestParam("orderSid") String orderSid);
 
+    @ApiOperation("手机端获取合同列表")
+    @PostMapping("/getAppContractList")
+    public ResultBean<PagerVo<AppCommonContractListVo>> getAppContractList(@RequestBody PagerQuery<AppCommonContractListQuery> query);
+
     /*****************************************************************************************/
 
     /**

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/CommonContractFeignFallback.java

@@ -120,6 +120,11 @@ public class CommonContractFeignFallback implements CommonContractFeign {
         return rb.setMsg("接口anrui-base/commoncontract/delAppBusOrderContractByOrderSid无法访问");
     }
 
+    @Override
+    public ResultBean<PagerVo<AppCommonContractListVo>> getAppContractList(PagerQuery<AppCommonContractListQuery> query) {
+        return null;
+    }
+
     @Override
     public ResultBean deleteBySids(String sids) {
         ResultBean rb = ResultBean.fireFail();

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

@@ -8,6 +8,7 @@ import com.yxt.anrui.base.api.basediscountpackage.*;
 import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 import java.util.Map;
@@ -68,4 +69,6 @@ public interface BaseDiscountpackageMapper extends BaseMapper<BaseDiscountpackag
     int selectBySids(String join);
 
     List<String> getMoney(@Param("vinSid") String vinSid, @Param("orgSid") String orgSid);
+
+    List<AppDiscountpackageListVo> selectAppDiscountpackageListByOrgSid(String orgSid);
 }

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

@@ -75,4 +75,9 @@
         where bd.vehSid = #{vinSid}
           and bbd.useOrg = #{orgSid} and bbd.nodeState='已办结' and bbd.salesPolicyKey = '0001'
     </select>
+
+    <select id="selectAppDiscountpackageListByOrgSid"
+            resultType="com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageListVo">
+        SELECT projectName,projectCost,discountExplain FROM base_discountpackage WHERE useOrg = #{orgSid}
+    </select>
 </mapper>

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

@@ -6,7 +6,6 @@ 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.base.api.basevehiclebrand.BaseVehicleBrandDictionariesVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
 import com.yxt.common.base.utils.PagerUtil;
@@ -147,11 +146,8 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign {
     }
 
     @Override
-    public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
+    public ResultBean<List<AppDiscountpackageListVo>> selectAppDiscountpackageListByUserSid(AppLableQuery appLableQuery) {
-        PagerVo<AppDiscountpackageVo> page = new PagerVo<>();
+        return baseDiscountpackageService.selectAppDiscountpackageListByUserSid(appLableQuery);
-        IPage<AppDiscountpackageVo> iPage = baseDiscountpackageService.getDiscountManageApplyList(pq);
-        PagerVo<AppDiscountpackageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return new ResultBean<PagerVo<AppDiscountpackageVo>>().success().setData(pagerVo);
     }
 
     @Override

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

@@ -712,7 +712,12 @@ public class BaseDiscountpackageService extends MybatisBaseService<BaseDiscountp
         return rb.success().setData(appBaseLableListVos);
     }
 
-    public IPage<AppDiscountpackageVo> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
+    public ResultBean<List<AppDiscountpackageListVo>> selectAppDiscountpackageListByUserSid(AppLableQuery appLableQuery) {
-        return null;
+        ResultBean<List<AppDiscountpackageListVo>> rb = ResultBean.fireFail();
+        ResultBean<String> resultBean = sysStaffOrgFeign.getPathSidByUserSid(appLableQuery.getUserSid());
+        ResultBean<SysOrganizationVo> resultBean1 = sysOrganizationFeign.fetchBySid(resultBean.getData());
+        String orgSid = resultBean1.getData().getSid();
+        List<AppDiscountpackageListVo> appDiscountpackageListVos = baseMapper.selectAppDiscountpackageListByOrgSid(orgSid);
+        return rb.success().setData(appDiscountpackageListVos);
     }
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basediscountpackageapply;
+
+import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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.basediscountpackage.AppDiscountpackageQuery;
+import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApply;
+import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Project: anrui-base(优惠包申请) <br/>
+ * File: BaseDiscountpackageApplyMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basediscountpackageapply.BaseDiscountpackageApplyMapper <br/>
+ * Description: 优惠包申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseDiscountpackageApplyMapper extends BaseMapper<BaseDiscountpackageApply> {
+
+	//@Update("update base_discountpackage_apply set name=#{msg} where id=#{id}")
+	//IPage<BaseDiscountpackageApplyVo> voPage(IPage<BaseDiscountpackageApply> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDiscountpackageApply> qw);
+	
+	IPage<BaseDiscountpackageApplyVo> selectPageVo(IPage<BaseDiscountpackageApply> page, @Param(Constants.WRAPPER) Wrapper<BaseDiscountpackageApply> qw);
+	
+	List<BaseDiscountpackageApplyVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseDiscountpackageApply> qw);
+	
+	@Select("select * from base_discountpackage_apply")
+	List<BaseDiscountpackageApplyVo> selectListVo();
+
+    IPage<AppDiscountpackageVo> getDiscountManageApplyList(IPage<AppDiscountpackageQuery> page,@Param(Constants.WRAPPER) QueryWrapper<AppDiscountpackageVo> qw);
+
+    int updateFlowFiled(Map<String, Object> map);
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyMapper.xml

@@ -0,0 +1,34 @@
+<?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.basediscountpackageapply.BaseDiscountpackageApplyMapper">
+<!--    <where> ${ew.sqlSegment} </where>-->
+<!--    ${ew.customSqlSegment} -->
+	<select id="selectPageVo" resultType="com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo">
+		SELECT * FROM base_discountpackage_apply <where> ${ew.sqlSegment} </where>
+	</select>
+	
+	<select id="selectListAllVo" resultType="com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo">
+		SELECT * FROM base_discountpackage_apply <where> ${ew.sqlSegment} </where>
+	</select>
+
+	<select id="getDiscountManageApplyList"
+            resultType="com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo">
+		SELECT * FROM base_discountpackage_apply <where> ${ew.sqlSegment} </where>
+    </select>
+
+	<update id="updateFlowFiled">
+		UPDATE base_discountpackage_apply
+		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/basediscountpackageapply/BaseDiscountpackageApplyRest.java

@@ -0,0 +1,168 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basediscountpackageapply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery;
+import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackageapply.*;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto;
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
+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;
+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;
+
+/**
+ * Project: anrui-base(优惠包申请) <br/>
+ * File: BaseDiscountpackageApplyFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basediscountpackageapply.BaseDiscountpackageApplyRest <br/>
+ * Description: 优惠包申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "优惠包申请")
+@RestController("com.yxt.anrui.base.biz.basediscountpackageapply.BaseDiscountpackageApplyRest")
+@RequestMapping("v1/basediscountpackageapply")
+public class BaseDiscountpackageApplyRest implements BaseDiscountpackageApplyFeign {
+
+	@Autowired
+	private BaseDiscountpackageApplyService baseDiscountpackageApplyService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseDiscountpackageApplyVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackageApplyQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseDiscountpackageApplyVo> pv = baseDiscountpackageApplyService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseDiscountpackageApplyDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseDiscountpackageApplyService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @DeleteMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseDiscountpackageApplyService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseDiscountpackageApplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseDiscountpackageApplyDetailsVo vo = baseDiscountpackageApplyService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
+		PagerVo<AppDiscountpackageVo> page = new PagerVo<>();
+		IPage<AppDiscountpackageVo> iPage = baseDiscountpackageApplyService.getDiscountManageApplyList(pq);
+		PagerVo<AppDiscountpackageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
+		return new ResultBean<PagerVo<AppDiscountpackageVo>>().success().setData(pagerVo);
+	}
+
+	@Override
+	public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
+		return baseDiscountpackageApplyService.saveDiscountPackageApplyInfo(dto);
+	}
+
+	@Override
+	public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
+		return baseDiscountpackageApplyService.getDiscountPackageApplyInfo(sid);
+	}
+
+	@Override
+	public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
+		return baseDiscountpackageApplyService.submitRecordApplication(dto);
+	}
+
+	@Override
+	public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(dto, bv);
+		bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
+		return baseDiscountpackageApplyService.complete(bv);
+	}
+
+	@Override
+	public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+		return baseDiscountpackageApplyService.revokeProcess(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+		return baseDiscountpackageApplyService.taskReject(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+		return baseDiscountpackageApplyService.breakProcess(flowTaskVo);
+	}
+
+	@Override
+	public ResultBean flowRecord(String procInsId) {
+		return baseDiscountpackageApplyService.flowRecord(procInsId);
+	}
+
+	@Override
+	public ResultBean getNextNodesForSubmit(GetNodeQuery query) {
+		return baseDiscountpackageApplyService.getNextNodesForSubmit(query);
+	}
+
+	@Override
+	public ResultBean getPreviousNodesForReject(GetNodeQuery query) {
+		return baseDiscountpackageApplyService.getPreviousNodesForReject(query);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageapply/BaseDiscountpackageApplyService.java

@@ -0,0 +1,434 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basediscountpackageapply;
+
+import cn.hutool.core.bean.BeanUtil;
+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.AppDiscountpackageQuery;
+import com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo;
+import com.yxt.anrui.base.api.basediscountpackageapply.*;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeVo;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto;
+import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDetailsVo;
+import com.yxt.anrui.base.api.basediscountpackagelist.AppDiscountpackagelistDto;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelist;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
+import com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistService;
+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.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 org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
+import java.util.stream.Collectors;
+
+/**
+ * Project: anrui-base(优惠包申请) <br/>
+ * File: BaseDiscountpackageApplyService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basediscountpackageapply.BaseDiscountpackageApplyService <br/>
+ * Description: 优惠包申请 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseDiscountpackageApplyService extends MybatisBaseService<BaseDiscountpackageApplyMapper, BaseDiscountpackageApply> {
+
+	@Autowired
+	private SysStaffOrgFeign sysStaffOrgFeign;
+	@Autowired
+	private BaseDiscountpackagelistService baseDiscountpackagelistService;
+	@Autowired
+	private FlowableFeign flowableFeign;
+	@Autowired
+	private SysUserFeign sysUserFeign;
+	@Autowired
+	private FlowTaskFeign flowTaskFeign;
+
+	private QueryWrapper<BaseDiscountpackageApply> createQueryWrapper(BaseDiscountpackageApplyQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseDiscountpackageApply> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseDiscountpackageApplyVo> listPageVo(PagerQuery<BaseDiscountpackageApplyQuery> pq) {
+		BaseDiscountpackageApplyQuery query = pq.getParams();
+		QueryWrapper<BaseDiscountpackageApply> qw = new QueryWrapper<>();
+
+		IPage<BaseDiscountpackageApply> page = PagerUtil.queryToPage(pq);
+		IPage<BaseDiscountpackageApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseDiscountpackageApplyVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseDiscountpackageApplyDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public String insertByDto(BaseDiscountpackageApplyDto dto){
+		BaseDiscountpackageApply entity = new BaseDiscountpackageApply();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		entity.setNodeState("待提交");
+		entity.setShowHandleBtn(true);
+		baseMapper.insert(entity);
+		return entity.getSid();
+	}
+	
+	public void updateByDto(BaseDiscountpackageApplyDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseDiscountpackageApply entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseDiscountpackageApplyDetailsVo fetchDetailsVoBySid(String sid){
+		BaseDiscountpackageApply entity = fetchBySid(sid);
+		BaseDiscountpackageApplyDetailsVo vo = new BaseDiscountpackageApplyDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public IPage<AppDiscountpackageVo> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
+		IPage<AppDiscountpackageQuery> page = PagerUtil.queryToPage(pq);
+		QueryWrapper<AppDiscountpackageVo> qw = new QueryWrapper<>();
+		AppDiscountpackageQuery params = pq.getParams();
+		String orgSid = sysStaffOrgFeign.getPathSidByUserSid(params.getUserSid()).getData();
+		qw.eq("createOrgSid", orgSid);
+		qw.eq("state",params.getType());
+		qw.eq("isDelete",0);
+		if (StringUtils.isNotBlank(params.getNames())){
+			qw.and(wrapper -> wrapper.like("contractId", params.getNames()).or().like("customerName", params.getNames()));
+		}
+		if (StringUtils.isNotBlank(params.getDate())){
+			qw.like("applyDate",params.getDate());
+		}
+		IPage<AppDiscountpackageVo> busOrderDiscountPageListVoIPage = baseMapper.getDiscountManageApplyList(page, qw);
+		return busOrderDiscountPageListVoIPage;
+	}
+
+	public ResultBean<String> saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		//根据用户sid获取staffSid
+		ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(dto.getUserSid());
+		if (!userVoResultBean.getSuccess()) {
+			return rb.setMsg(userVoResultBean.getMsg());
+		}
+		//根据staffSid获取用户的组织全路径
+		ResultBean<SysStaffOrg> staffOrgResultBean = sysStaffOrgFeign.getOrgByStaffSid(userVoResultBean.getData().getStaffSid());
+		if (!staffOrgResultBean.getSuccess()) {
+			return rb.setMsg(staffOrgResultBean.getMsg());
+		}
+		String orgSidPath = staffOrgResultBean.getData().getOrgSidPath();
+		String dtoSid = dto.getSid();
+		List<AppDiscountpackagelistDto> appDiscountpackagelists = dto.getDiscountPackageList();
+		if (StringUtils.isBlank(dtoSid)) {
+			BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
+			BeanUtil.copyProperties(dto,baseDiscountpackageApplyDto);
+			baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
+			String sid = this.insertByDto(baseDiscountpackageApplyDto);
+			for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
+				BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
+				BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
+				baseDiscountpackagelist.setDiscountSid(sid);
+				baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist);
+			}
+			return rb.success().setMsg("添加成功").setData(sid);
+		}
+		BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dtoSid);
+		if (baseDiscountpackageApply == null){
+			return rb.setMsg("该优惠包申请不存在");
+		}
+		baseDiscountpackagelistService.delByDiscountSid(dtoSid);
+		BaseDiscountpackageApplyDto baseDiscountpackageApplyDto = new BaseDiscountpackageApplyDto();
+		BeanUtil.copyProperties(dto,baseDiscountpackageApplyDto);
+		baseDiscountpackageApplyDto.setOrgSidPath(orgSidPath);
+		this.updateByDto(baseDiscountpackageApplyDto);
+		for (AppDiscountpackagelistDto appDiscountpackagelist : appDiscountpackagelists) {
+			BaseDiscountpackagelistDto baseDiscountpackagelist = new BaseDiscountpackagelistDto();
+			BeanUtil.copyProperties(appDiscountpackagelist, baseDiscountpackagelist);
+			baseDiscountpackagelist.setDiscountSid(dtoSid);
+			baseDiscountpackagelistService.saveOrUpdateDto(baseDiscountpackagelist);
+		}
+		return rb.success().setMsg("修改成功").setData(dtoSid);
+	}
+
+	public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
+		ResultBean rb = ResultBean.fireFail();
+		AppDiscountpackageApplyDetailsVo appDiscountpackageApplyDetailsVo = new AppDiscountpackageApplyDetailsVo();
+		BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(sid);
+		BeanUtil.copyProperties(baseDiscountpackageApply,appDiscountpackageApplyDetailsVo);
+		List<AppDiscountpackagelistDetailsVo> appDiscountpackagelistDetailsVos = baseDiscountpackagelistService.fetchByDiscountSid(sid);
+		appDiscountpackageApplyDetailsVo.setAppDiscountpackagelists(appDiscountpackagelistDetailsVos);
+		return rb.success().setData(appDiscountpackageApplyDetailsVo);
+	}
+
+	public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
+		ResultBean rb = ResultBean.fireFail();
+		BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(dto.getSid());
+		int r = submitBusinessData(dto, baseDiscountpackageApply);
+		if (r == 3) {
+			return rb.setMsg("该申请不存在");
+		}
+		if (r == 0) {
+			return rb.setMsg("操作失败!提交的数据不一致");
+		}
+		//新增修改保存
+		ResultBean<String> resultBean = saveDiscountPackageApplyInfo(dto);
+		if (!resultBean.getSuccess()) {
+			return rb.setMsg(resultBean.getMsg());
+		}
+		String businessSid = resultBean.getData();
+		//创建BusinessVariables实体对象
+		BusinessVariables bv = new BusinessVariables();
+		//流程中的参数赋值
+		Map<String, Object> variables = BeanUtil.beanToMap(dto);
+		//若有网关，则赋值网关中判断的字段。
+		variables.put("businessSid", businessSid);
+		BaseDiscountpackageApply baseDiscountpackageApply1 = fetchBySid(businessSid);
+		//用户的部门全路径sid
+		bv.setOrgSidPath(baseDiscountpackageApply1.getOrgSidPath());
+		//业务sid
+		bv.setBusinessSid(businessSid);
+		//用户sid
+		bv.setUserSid(dto.getUserSid());
+		bv.setFormVariables(variables);
+		//流程定义id
+		bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
+		if (r == 1) {
+			ResultBean<UpdateFlowFieldVo> voResultBean = flowableFeign.startProcess(bv);
+			if (!voResultBean.getSuccess()) {
+				return rb.setMsg(voResultBean.getMsg());
+			}
+			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(baseDiscountpackageApply.getTaskId());
+			bv.setTaskDefKey(baseDiscountpackageApply.getNodeSid());
+			bv.setComment("重新提交");
+			bv.setInstanceId(dto.getInstanceId());
+			return complete(bv);
+		}
+		return rb;
+	}
+
+	/**
+	 * 判断提交的流程是否被允许
+	 *
+	 * @param dto
+	 * @return
+	 */
+	private synchronized int submitBusinessData(SubmitBaseDiscountpackageApplyDto dto, BaseDiscountpackageApply baseDiscountpackageApply) {
+		int r = 0;
+		if (StringUtils.isBlank(dto.getSid())) {
+			r = 1;
+		} else {
+			if (baseDiscountpackageApply != null) {
+				String businessTaskId = baseDiscountpackageApply.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;
+	}
+
+	/**
+	 * 更新流程相关的状态
+	 *
+	 * @param map
+	 * @return
+	 */
+	private int updateFlowFiled(Map<String, Object> map) {
+		return baseMapper.updateFlowFiled(map);
+	}
+
+
+	public ResultBean complete(BusinessVariables bv) {
+		ResultBean rb = ResultBean.fireFail();
+		String businessSid = bv.getBusinessSid();
+		BaseDiscountpackageApply baseDiscountpackageApply = this.fetchBySid(businessSid);
+		if (bv.getTaskId().equals(baseDiscountpackageApply.getTaskId())) {
+			bv.setOrgSidPath(baseDiscountpackageApply.getOrgSidPath());
+			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 revokeProcess(FlowTaskVo flowTaskVo) {
+		com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+		BaseDiscountpackageApply baseDiscountpackageApply = this.fetchBySid(flowTaskVo.getBusinessSid());
+		String businessTaskid = baseDiscountpackageApply.getTaskId();
+		if (businessTaskid.equals(flowTaskVo.getTaskId())) { //只有数据一致的时候才能进行下一步
+			BeanUtil.copyProperties(flowTaskVo, fl);
+			fl.setBusinessSid(flowTaskVo.getBusinessSid());
+			fl.setUserSid(flowTaskVo.getUserSid());
+			ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.revokeProcess(fl);
+			if (!resultBean.getSuccess()) {
+				return resultBean;
+			}
+			updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+			return resultBean;
+		} else {
+			return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
+		}
+	}
+
+	public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+		ResultBean rb = ResultBean.fireFail();
+		com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+		BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(flowTaskVo.getBusinessSid());
+		if (baseDiscountpackageApply == null) {
+			return rb.setMsg("该申请不存在");
+		}
+		String businessTaskId = baseDiscountpackageApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(flowTaskVo.getTaskId())) {
+				BeanUtil.copyProperties(flowTaskVo, fl);
+				fl.setBusinessSid(flowTaskVo.getBusinessSid());
+				fl.setUserSid(flowTaskVo.getUserSid());
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.taskReject(fl);
+				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 breakProcess(FlowTaskVo flowTaskVo) {
+		ResultBean rb = ResultBean.fireFail();
+		com.yxt.anrui.flowable.api.flowtask.FlowTaskVo fl = new com.yxt.anrui.flowable.api.flowtask.FlowTaskVo();
+		if (StringUtils.isBlank(flowTaskVo.getInstanceId())) {
+			return rb.setMsg("参数错误：instanceId");
+		}
+		if (StringUtils.isBlank(flowTaskVo.getUserSid())) {
+			return rb.setMsg("参数错误：userSid");
+		}
+		BaseDiscountpackageApply baseDiscountpackageApply = fetchBySid(flowTaskVo.getBusinessSid());
+		String businessTaskId = baseDiscountpackageApply.getTaskId();
+		if (StringUtils.isNotBlank(businessTaskId)) {
+			if (businessTaskId.equals(flowTaskVo.getTaskId())) {
+				BeanUtil.copyProperties(flowTaskVo, fl);
+				fl.setBusinessSid(flowTaskVo.getBusinessSid());
+				fl.setUserSid(flowTaskVo.getUserSid());
+				ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.breakProcess(fl);
+				if (!resultBean.getSuccess()) {
+					return rb.setMsg(resultBean.getMsg());
+				}
+				updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
+				return rb.success().setData(resultBean.getData());
+			}
+		}
+		return rb.setMsg("操作失败!提交的数据不一致!");
+	}
+
+	public ResultBean flowRecord(String procInsId) {
+		return flowTaskFeign.businessFlowRecord(procInsId);
+	}
+
+	public ResultBean<List<GetNodeVo>> getNextNodesForSubmit(GetNodeQuery query) {
+		ResultBean<List<GetNodeVo>> rb = ResultBean.fireFail();
+		BusinessVariables bv = new BusinessVariables();
+		BeanUtil.copyProperties(query, bv);
+		bv.setModelId(ProcDefEnum.BASEDISPACKAGEAPPLY.getProDefId());
+		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.BASEDISPACKAGEAPPLY.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);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistMapper.java

@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basediscountpackagelist;
+
+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.basediscountpackagelist.AppDiscountpackagelistDetailsVo;
+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.basediscountpackagelist.BaseDiscountpackagelist;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(优惠包申请) <br/>
+ * File: BaseDiscountpackagelistMapper.java <br/>
+ * Class: com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistMapper <br/>
+ * Description: 优惠包申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BaseDiscountpackagelistMapper extends BaseMapper<BaseDiscountpackagelist> {
+
+	//@Update("update base_discountpackagelist set name=#{msg} where id=#{id}")
+	//IPage<BaseDiscountpackagelistVo> voPage(IPage<BaseDiscountpackagelist> page, @Param(Constants.WRAPPER) QueryWrapper<BaseDiscountpackagelist> qw);
+	
+	IPage<BaseDiscountpackagelistVo> selectPageVo(IPage<BaseDiscountpackagelist> page, @Param(Constants.WRAPPER) Wrapper<BaseDiscountpackagelist> qw);
+	
+	List<BaseDiscountpackagelistVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BaseDiscountpackagelist> qw);
+	
+	@Select("select * from base_discountpackagelist")
+	List<BaseDiscountpackagelistVo> selectListVo();
+
+	@Delete("delete from base_discountpackagelist where discountSid = #{dtoSid}")
+    void delByDiscountSid(String dtoSid);
+
+	@Select("select * from base_discountpackagelist from discountSid = #{sid}")
+	List<AppDiscountpackagelistDetailsVo> fetchByDiscountSid(String sid);
+}

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

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistRest.java

@@ -0,0 +1,100 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basediscountpackagelist;
+
+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.basediscountpackagelist.BaseDiscountpackagelist;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistQuery;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDetailsVo;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto;
+import com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistFeign;
+
+/**
+ * Project: anrui-base(优惠包申请) <br/>
+ * File: BaseDiscountpackagelistFeignFallback.java <br/>
+ * Class: com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistRest <br/>
+ * Description: 优惠包申请. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "优惠包申请")
+@RestController("com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistRest")
+@RequestMapping("v1/basediscountpackagelist")
+public class BaseDiscountpackagelistRest implements BaseDiscountpackagelistFeign {
+
+	@Autowired
+	private BaseDiscountpackagelistService baseDiscountpackagelistService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BaseDiscountpackagelistVo>> listPage(@RequestBody PagerQuery<BaseDiscountpackagelistQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BaseDiscountpackagelistVo> pv = baseDiscountpackagelistService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BaseDiscountpackagelistDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		baseDiscountpackagelistService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		baseDiscountpackagelistService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BaseDiscountpackagelistDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BaseDiscountpackagelistDetailsVo vo = baseDiscountpackagelistService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackagelist/BaseDiscountpackagelistService.java

@@ -0,0 +1,113 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.base.biz.basediscountpackagelist;
+
+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.basediscountpackagelist.*;
+import org.apache.commons.lang3.StringUtils;
+import com.yxt.common.base.service.MybatisBaseService;
+import com.yxt.common.base.utils.PagerUtil;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(优惠包申请) <br/>
+ * File: BaseDiscountpackagelistService.java <br/>
+ * Class: com.yxt.anrui.base.biz.basediscountpackagelist.BaseDiscountpackagelistService <br/>
+ * Description: 优惠包申请 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BaseDiscountpackagelistService extends MybatisBaseService<BaseDiscountpackagelistMapper, BaseDiscountpackagelist> {
+	private QueryWrapper<BaseDiscountpackagelist> createQueryWrapper(BaseDiscountpackagelistQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BaseDiscountpackagelist> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BaseDiscountpackagelistVo> listPageVo(PagerQuery<BaseDiscountpackagelistQuery> pq) {
+		BaseDiscountpackagelistQuery query = pq.getParams();
+		QueryWrapper<BaseDiscountpackagelist> qw = createQueryWrapper(query);
+		IPage<BaseDiscountpackagelist> page = PagerUtil.queryToPage(pq);
+		IPage<BaseDiscountpackagelistVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BaseDiscountpackagelistVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BaseDiscountpackagelistDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BaseDiscountpackagelistDto dto){
+		BaseDiscountpackagelist entity = new BaseDiscountpackagelist();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BaseDiscountpackagelistDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BaseDiscountpackagelist entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BaseDiscountpackagelistDetailsVo fetchDetailsVoBySid(String sid){
+		BaseDiscountpackagelist entity = fetchBySid(sid);
+		BaseDiscountpackagelistDetailsVo vo = new BaseDiscountpackagelistDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public void delByDiscountSid(String dtoSid) {
+		baseMapper.delByDiscountSid(dtoSid);
+	}
+
+	public List<AppDiscountpackagelistDetailsVo> fetchByDiscountSid(String sid) {
+		return baseMapper.fetchByDiscountSid(sid);
+	}
+}

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.java

@@ -75,7 +75,6 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
      * 移动端-初始化合同审核
      *
      * @param contractSid
-     * @param staffSid
      * @return
      */
     AppCommonContractInitVo getContractInfo(@Param("contractSid") String contractSid);
@@ -93,4 +92,6 @@ public interface CommonContractMapper extends BaseMapper<CommonContract> {
     CommonContractVo getContractBySalesOrderSid(@Param("busSid") String busSid);
 
     CommonContract selectByNo(String contractNo);
+
+    IPage<AppCommonContractListVo> getAppContractList(IPage<CommonContract> page,@Param(Constants.WRAPPER) QueryWrapper<CommonContract> qw);
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.yxt.anrui.base.biz.commoncontract.CommonContractMapper">
     <insert id="saveList">
         INSERT INTO common_contract(sid, contractNo, contractType, partyA, partyB, partyC, createBySid,
-                                    createDate, address, deposit, contractAmount, remarks)
+        createDate, address, deposit, contractAmount, remarks)
         VALUES
         <foreach collection="list" item="item" index="index" separator=",">
             (UUID(),<!--sid-->
@@ -39,19 +39,19 @@
     </select>
     <select id="listExcel" resultType="com.yxt.anrui.base.api.commoncontract.CommonContractExportVo">
         SELECT cc.`contractNo`,
-               cc.`contractType`,
+        cc.`contractType`,
-               cc.`partyA`,
+        cc.`partyA`,
-               cc.`partyB`,
+        cc.`partyB`,
-               cc.`partyC`,
+        cc.`partyC`,
-               suser.`userName` creatName,
+        suser.`userName` creatName,
-               cc.`createDate`,
+        cc.`createDate`,
-               cc.`address`,
+        cc.`address`,
-               cc.`deposit`,
+        cc.`deposit`,
-               cc.`contractAmount`,
+        cc.`contractAmount`,
-               cc.`remarks`
+        cc.`remarks`
         FROM common_contract cc
-                 LEFT JOIN anrui_portal.`sys_user` suser
+        LEFT JOIN anrui_portal.`sys_user` suser
-                           ON cc.createBySid = suser.`sid`
+        ON cc.createBySid = suser.`sid`
         <where>
             ${ew.sqlSegment}
         </where>
@@ -68,27 +68,27 @@
     </select>
 
     <select id="getContractList" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractPageVo">
-        SELECT sid                                         AS contractSid,
+        SELECT sid AS contractSid,
-               contractNo                                  AS contractId,
+        contractNo AS contractId,
-               contractType,
+        contractType,
-               partyB,
+        partyB,
-               modelName                                   as model,
+        modelName as model,
-               staffName                                   as handler,
+        staffName as handler,
-               contractAmount                              AS contractPrice,
+        contractAmount AS contractPrice,
-               if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
+        if(length(nodeState) > 0, nodeState, '待提交') as nodeState,
-               if(length(nodeState) > 0, false, true)      as isShowUpdate,
+        if(length(nodeState) > 0, false, true) as isShowUpdate,
-               commonContractUrl,
+        commonContractUrl,
-               num
+        num
         FROM common_contract
         <where>
             ${ew.sqlSegment}
             <if test="names != null and names != ''">
                 and concat(IFNULL(contractNo
-                  , '')
+                , '')
-                  , ifnull(partyB
+                , ifnull(partyB
-                  , '')) LIKE concat('%'
+                , '')) LIKE concat('%'
-                  , #{names}
+                , #{names}
-                  , '%')
+                , '%')
             </if>
             order by id desc
         </where>
@@ -137,7 +137,7 @@
     <update id="updateFlowFiled">
         UPDATE common_contract
         SET nodeState=#{nodeState}
-          , nodeId=#{taskDefKey}
+        , nodeId=#{taskDefKey}
         <if test="procDefId != null and procDefId != ''">
             , procDefId=#{procDefId}
         </if>
@@ -161,4 +161,21 @@
         from common_contract
         where contractNo = #{contractNo}
     </select>
+
+    <select id="getAppContractList" resultType="com.yxt.anrui.base.api.commoncontract.AppCommonContractListVo">
+        SELECT
+        contractNo AS contractId,
+        sid AS contractSid,
+        partyB AS customer,
+        modelName AS model,
+        modelSid,
+        configSid,
+        num AS carNum,
+        price
+        FROM
+        common_contract
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
 </mapper>

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractRest.java

@@ -344,6 +344,13 @@ public class CommonContractRest implements CommonContractFeign {
         return new ResultBean().success().setMsg("删除成功");
     }
 
+    @Override
+    public ResultBean<PagerVo<AppCommonContractListVo>> getAppContractList(PagerQuery<AppCommonContractListQuery> query) {
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AppCommonContractListVo> pv = commonContractService.getAppContractList(query);
+        return rb.success().setData(pv);
+    }
+
     @Override
     public ResultBean deleteBySids(String sids) {
         List<String> sidList = Arrays.asList(sids.split(","));

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java

@@ -2166,4 +2166,19 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
         CommonContract commonContract = baseMapper.selectByNo(contractNo);
         return rb.success().setData(commonContract);
     }
+
+    public PagerVo<AppCommonContractListVo> getAppContractList(PagerQuery<AppCommonContractListQuery> query) {
+        AppCommonContractListQuery params = query.getParams();
+        QueryWrapper<CommonContract> qw = new QueryWrapper<>();
+        SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
+        String staffSid = sysUserVo.getStaffSid();
+        qw.eq("staffSid",staffSid);
+        if (StringUtils.isNotBlank(params.getNames())){
+            qw.and(wrapper -> wrapper.like("contractNo", params.getNames()).or().like("partyB", params.getNames()));
+        }
+        IPage<CommonContract> page = PagerUtil.queryToPage(query);
+        IPage<AppCommonContractListVo> pagging = baseMapper.getAppContractList(page, qw);
+        PagerVo<AppCommonContractListVo> p = PagerUtil.pageToVo(pagging, null);
+        return p;
+    }
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannel.java

@@ -0,0 +1,90 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buspurchasechannel;
+
+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-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannel.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannel <br/>
+ * Description: 采购渠道选择表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购渠道选择表", description = "采购渠道选择表")
+@TableName("bus_purchase_channel")
+public class BusPurchaseChannel extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("销售订单sid")
+    private String saleOrderSid; // 销售订单sid
+	@ApiModelProperty("销售订单编号")
+    private String saleOrderNo; // 销售订单编号
+	@ApiModelProperty("销售订单审批日期")
+    private String saleOrderApproDate; // 销售订单审批日期
+	@ApiModelProperty("业务类型")
+    private String businessType; // 业务类型
+	@ApiModelProperty("申请部门sid")
+    private String applyDeptSid; // 申请部门sid
+	@ApiModelProperty("申请部门名称")
+    private String applyDeptName; // 申请部门名称
+	@ApiModelProperty("申请人sid")
+    private String applyPeoSid; // 申请人sid
+	@ApiModelProperty("申请人姓名")
+    private String applyPeoName; // 申请人姓名
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+	@ApiModelProperty("配置sid")
+    private String configSid; // 配置sid
+	@ApiModelProperty("配置名称")
+    private String configName; // 配置名称
+	@ApiModelProperty("数量")
+    private String num; // 数量
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("采购渠道key")
+    private String purchaseOrderTypeKey; // 采购渠道key
+	@ApiModelProperty("采购渠道value")
+    private String purchaseOrderTypeValue; // 采购渠道value
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelDetailsVo.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buspurchasechannel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannelVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo <br/>
+ * Description: 采购渠道选择表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购渠道选择表 视图数据详情", description = "采购渠道选择表 视图数据详情")
+public class BusPurchaseChannelDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("销售订单sid")
+    private String saleOrderSid; // 销售订单sid
+	@ApiModelProperty("销售订单编号")
+    private String saleOrderNo; // 销售订单编号
+	@ApiModelProperty("销售订单审批日期")
+    private String saleOrderApproDate; // 销售订单审批日期
+	@ApiModelProperty("业务类型")
+    private String businessType; // 业务类型
+	@ApiModelProperty("申请部门sid")
+    private String applyDeptSid; // 申请部门sid
+	@ApiModelProperty("申请部门名称")
+    private String applyDeptName; // 申请部门名称
+	@ApiModelProperty("申请人sid")
+    private String applyPeoSid; // 申请人sid
+	@ApiModelProperty("申请人姓名")
+    private String applyPeoName; // 申请人姓名
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+	@ApiModelProperty("配置sid")
+    private String configSid; // 配置sid
+	@ApiModelProperty("配置名称")
+    private String configName; // 配置名称
+	@ApiModelProperty("数量")
+    private String num; // 数量
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("采购渠道key")
+    private String purchaseOrderTypeKey; // 采购渠道key
+	@ApiModelProperty("采购渠道value")
+    private String purchaseOrderTypeValue; // 采购渠道value
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelDto.java

@@ -0,0 +1,91 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buspurchasechannel;
+
+
+import com.yxt.common.core.dto.Dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannelDto.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDto <br/>
+ * Description: 采购渠道选择表 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购渠道选择表 数据传输对象", description = "采购渠道选择表 数据传输对象")
+public class BusPurchaseChannelDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("销售订单sid")
+    private String saleOrderSid; // 销售订单sid
+	@ApiModelProperty("销售订单编号")
+    private String saleOrderNo; // 销售订单编号
+	@ApiModelProperty("销售订单审批日期")
+    private String saleOrderApproDate; // 销售订单审批日期
+	@ApiModelProperty("业务类型")
+    private String businessType; // 业务类型
+	@ApiModelProperty("申请部门sid")
+    private String applyDeptSid; // 申请部门sid
+	@ApiModelProperty("申请部门名称")
+    private String applyDeptName; // 申请部门名称
+	@ApiModelProperty("申请人sid")
+    private String applyPeoSid; // 申请人sid
+	@ApiModelProperty("申请人姓名")
+    private String applyPeoName; // 申请人姓名
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+	@ApiModelProperty("配置sid")
+    private String configSid; // 配置sid
+	@ApiModelProperty("配置名称")
+    private String configName; // 配置名称
+	@ApiModelProperty("数量")
+    private String num; // 数量
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("采购渠道key")
+    private String purchaseOrderTypeKey; // 采购渠道key
+	@ApiModelProperty("采购渠道value")
+    private String purchaseOrderTypeValue; // 采购渠道value
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelFeign.java

@@ -0,0 +1,84 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buspurchasechannel;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannelFeign.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelFeign <br/>
+ * Description: 采购渠道选择表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购渠道选择表")
+@FeignClient(
+        contextId = "anrui-buscenter-BusPurchaseChannel",
+        name = "anrui-buscenter",
+        path = "v1/buspurchasechannel",
+        fallback = BusPurchaseChannelFeignFallback.class)
+public interface BusPurchaseChannelFeign {
+
+    @ApiOperation("根据条件分页查询数据的列表")
+    @PostMapping("/listPage")
+    @ResponseBody
+    public ResultBean<PagerVo<BusPurchaseChannelVo>> listPage(@RequestBody PagerQuery<BusPurchaseChannelQuery> pq);
+
+    @ApiOperation("新增或修改")
+    @PostMapping("/save")
+    @ResponseBody
+    public ResultBean save(@RequestBody BusPurchaseChannelDto dto);
+        
+    @ApiOperation("根据sid删除记录")
+    @DeleteMapping("/delBySids")
+    @ResponseBody
+    public ResultBean delBySids(@RequestBody String[] sids);
+      
+    @ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    @ResponseBody
+    public ResultBean<BusPurchaseChannelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
+
+    @ApiOperation("选择")
+    @PostMapping("/choice")
+    @ResponseBody
+    public ResultBean choice(@RequestBody List<BusPurchaseChannelDto> dto);
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelFeignFallback.java

@@ -0,0 +1,77 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buspurchasechannel;
+
+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-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelFeignFallback <br/>
+ * Description: 采购渠道选择表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class BusPurchaseChannelFeignFallback implements BusPurchaseChannelFeign {
+
+	@Override
+	public ResultBean<PagerVo<BusPurchaseChannelVo>> listPage(PagerQuery<BusPurchaseChannelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buspurchasechannel/listPage无法访问");
+	}
+
+	@Override
+	public ResultBean save(BusPurchaseChannelDto dto){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buspurchasechannel/save无法访问");
+	}
+
+	@Override
+	public ResultBean delBySids( String[] sids){
+		return ResultBean.fireFail().setMsg("接口anrui-buscenter/buspurchasechannel/delBySids无法访问");
+	}
+
+	@Override
+	public ResultBean<BusPurchaseChannelDetailsVo> fetchDetailsBySid(String sid){
+		ResultBean rb = ResultBean.fireFail();
+		return rb.setMsg("接口anrui-buscenter/buspurchasechannel/fetchDetailsBySid无法访问");
+	}
+
+	@Override
+	public ResultBean choice(List<BusPurchaseChannelDto> dto) {
+		return null;
+	}
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelQuery.java

@@ -0,0 +1,72 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buspurchasechannel;
+
+
+import com.yxt.common.core.query.Query;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannelQuery.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelQuery <br/>
+ * Description: 采购渠道选择表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购渠道选择表 查询条件", description = "采购渠道选择表 查询条件")
+public class BusPurchaseChannelQuery implements Query {
+
+	@ApiModelProperty("销售订单编号")
+    private String saleOrderNo; // 销售订单编号
+	@ApiModelProperty("销售订单审批开始日期")
+    private String saleOrderApproStartDate; // 销售订单审批开始日期
+    @ApiModelProperty("销售订单审批结束日期")
+    private String saleOrderApproEndDate; // 销售订单审批结束日期
+	@ApiModelProperty("业务类型")
+    private String businessType; // 业务类型
+	@ApiModelProperty("申请部门sid")
+    private String applyDeptSid; // 申请部门sid
+	@ApiModelProperty("申请人姓名")
+    private String applyPeoName; // 申请人姓名
+	@ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+	@ApiModelProperty("配置名称")
+    private String configName; // 配置名称
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+    @ApiModelProperty("待/已选择")
+    private String state; // 待/已选择(1待选择，2已选择)
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/buspurchasechannel/BusPurchaseChannelVo.java

@@ -0,0 +1,94 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.api.buspurchasechannel;
+
+
+import com.yxt.common.core.vo.Vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannelVo.java <br/>
+ * Class: com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo <br/>
+ * Description: 采购渠道选择表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "采购渠道选择表 视图数据对象", description = "采购渠道选择表 视图数据对象")
+public class BusPurchaseChannelVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("创建人接口")
+    private String createByName; // 创建人接口
+	@ApiModelProperty("销售订单sid")
+    private String saleOrderSid; // 销售订单sid
+	@ApiModelProperty("销售订单编号")
+    private String saleOrderNo; // 销售订单编号
+	@ApiModelProperty("销售订单审批日期")
+    private String saleOrderApproDate; // 销售订单审批日期
+	@ApiModelProperty("业务类型")
+    private String businessType; // 业务类型
+	@ApiModelProperty("申请部门sid")
+    private String applyDeptSid; // 申请部门sid
+	@ApiModelProperty("申请部门名称")
+    private String applyDeptName; // 申请部门名称
+	@ApiModelProperty("申请人sid")
+    private String applyPeoSid; // 申请人sid
+	@ApiModelProperty("申请人姓名")
+    private String applyPeoName; // 申请人姓名
+	@ApiModelProperty("车型sid")
+    private String modelSid; // 车型sid
+	@ApiModelProperty("车型名称")
+    private String modelName; // 车型名称
+	@ApiModelProperty("配置sid")
+    private String configSid; // 配置sid
+	@ApiModelProperty("配置名称")
+    private String configName; // 配置名称
+	@ApiModelProperty("数量")
+    private String num; // 数量
+	@ApiModelProperty("分公司sid")
+    private String useOrgSid; // 分公司sid
+	@ApiModelProperty("分公司名称")
+    private String useOrgName; // 分公司名称
+	@ApiModelProperty("采购渠道key")
+    private String purchaseOrderTypeKey; // 采购渠道key
+	@ApiModelProperty("采购渠道value")
+    private String purchaseOrderTypeValue; // 采购渠道value
+    @ApiModelProperty("流程定义id")
+    private String procDefId;
+    @ApiModelProperty("流程实例id")
+    private String procInstId;
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelMapper.java

@@ -0,0 +1,67 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buspurchasechannel;
+
+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.buscenter.api.buspurchasechannel.BusPurchaseChannel;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannelMapper.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelMapper <br/>
+ * Description: 采购渠道选择表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Mapper
+public interface BusPurchaseChannelMapper extends BaseMapper<BusPurchaseChannel> {
+
+	//@Update("update bus_purchase_channel set name=#{msg} where id=#{id}")
+	//IPage<BusPurchaseChannelVo> voPage(IPage<BusPurchaseChannel> page, @Param(Constants.WRAPPER) QueryWrapper<BusPurchaseChannel> qw);
+	
+	IPage<BusPurchaseChannelVo> selectPageVo(IPage<BusPurchaseChannel> page, @Param(Constants.WRAPPER) Wrapper<BusPurchaseChannel> qw);
+	
+	List<BusPurchaseChannelVo> selectListAllVo(@Param(Constants.WRAPPER) Wrapper<BusPurchaseChannel> qw);
+	
+	@Select("select * from bus_purchase_channel")
+	List<BusPurchaseChannelVo> selectListVo();
+
+	void choice(@Param("sid") String sid,@Param("purchaseOrderTypeKey") String purchaseOrderTypeKey,@Param("purchaseOrderTypeValue") String purchaseOrderTypeValue);
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelMapper.xml

@@ -0,0 +1,35 @@
+<?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.buscenter.biz.buspurchasechannel.BusPurchaseChannelMapper">
+    <!--    <where> ${ew.sqlSegment} </where>-->
+    <!--    ${ew.customSqlSegment} -->
+    <select id="selectPageVo" resultType="com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo">
+        SELECT
+        bpc.*,
+        bso.procDefId,
+        bso.procInstId
+        FROM
+        bus_purchase_channel bpc
+        LEFT JOIN bus_sales_order bso
+        ON bpc.`saleOrderSid` = bso.`sid`
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <select id="selectListAllVo" resultType="com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo">
+        SELECT * FROM bus_purchase_channel
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
+
+    <update id="choice">
+        UPDATE
+                bus_purchase_channel
+        SET purchaseOrderTypeKey   = #{purchaseOrderTypeKey},
+            purchaseOrderTypeValue = #{purchaseOrderTypeValue},
+            state                  = 2
+        WHERE sid = #{sid}
+    </update>
+</mapper>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelRest.java

@@ -0,0 +1,105 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buspurchasechannel;
+
+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.buscenter.api.buspurchasechannel.BusPurchaseChannel;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelQuery;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDetailsVo;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDto;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelFeign;
+
+/**
+ * Project: anrui-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannelFeignFallback.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelRest <br/>
+ * Description: 采购渠道选择表. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "采购渠道选择表")
+@RestController("com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelRest")
+@RequestMapping("v1/buspurchasechannel")
+public class BusPurchaseChannelRest implements BusPurchaseChannelFeign {
+
+	@Autowired
+	private BusPurchaseChannelService busPurchaseChannelService;
+
+	@Override
+	@ApiOperation("根据条件分页查询数据的列表")
+	@PostMapping("/listPage")
+	public ResultBean<PagerVo<BusPurchaseChannelVo>> listPage(@RequestBody PagerQuery<BusPurchaseChannelQuery> pq){
+		ResultBean rb = ResultBean.fireFail();
+		PagerVo<BusPurchaseChannelVo> pv = busPurchaseChannelService.listPageVo(pq);
+		return rb.success().setData(pv);
+	}
+
+	@Override
+	@ApiOperation("新增或修改")
+	@PostMapping("/save")
+	public ResultBean save(@RequestBody BusPurchaseChannelDto dto){
+		ResultBean rb = ResultBean.fireFail();
+		busPurchaseChannelService.saveOrUpdateDto(dto);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据sid批量删除")
+    @PostMapping("/delBySids")
+    public ResultBean delBySids(@RequestBody String[] sids){
+		ResultBean rb = ResultBean.fireFail();
+		busPurchaseChannelService.delBySids(sids);
+		return rb.success();
+	}
+
+	@Override
+	@ApiOperation("根据SID获取一条记录")
+    @GetMapping("/fetchDetailsBySid/{sid}")
+    public ResultBean<BusPurchaseChannelDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid){
+		ResultBean rb = ResultBean.fireFail();
+		BusPurchaseChannelDetailsVo vo = busPurchaseChannelService.fetchDetailsVoBySid(sid);
+		return rb.success().setData(vo);
+	}
+
+	@Override
+	public ResultBean choice(List<BusPurchaseChannelDto> dto) {
+		return busPurchaseChannelService.choice(dto);
+	}
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/buspurchasechannel/BusPurchaseChannelService.java

@@ -0,0 +1,147 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.buscenter.biz.buspurchasechannel;
+
+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.buscenter.api.buspurchasechannel.BusPurchaseChannel;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelQuery;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelVo;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDetailsVo;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDto;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelFeign;
+
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * Project: anrui-buscenter(采购渠道选择) <br/>
+ * File: BusPurchaseChannelService.java <br/>
+ * Class: com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelService <br/>
+ * Description: 采购渠道选择表 业务逻辑. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-17 10:46:49 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class BusPurchaseChannelService extends MybatisBaseService<BusPurchaseChannelMapper, BusPurchaseChannel> {
+	private QueryWrapper<BusPurchaseChannel> createQueryWrapper(BusPurchaseChannelQuery query) {
+		// todo: 这里根据具体业务调整查询条件
+		// 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
+		QueryWrapper<BusPurchaseChannel> qw = new QueryWrapper<>();
+		return qw;
+	}
+	
+	public PagerVo<BusPurchaseChannelVo> listPageVo(PagerQuery<BusPurchaseChannelQuery> pq) {
+		BusPurchaseChannelQuery query = pq.getParams();
+		QueryWrapper<BusPurchaseChannel> qw = new QueryWrapper<>();
+		qw.eq("bpc.state",query.getState());
+		qw.eq("bpc.useOrgSid",query.getUseOrgSid());
+		String saleOrderApproStartDate = query.getSaleOrderApproStartDate();
+		String saleOrderApproEndDate = query.getSaleOrderApproEndDate();
+		qw.apply(StringUtils.isNotBlank(saleOrderApproStartDate), "date_format (bpc.saleOrderApproDate,'%Y-%m-%d') >= date_format('" + saleOrderApproStartDate + "','%Y-%m-%d')").
+				apply(StringUtils.isNotBlank(saleOrderApproEndDate), "date_format (bpc.saleOrderApproDate,'%Y-%m-%d') <= date_format('" + saleOrderApproEndDate + "','%Y-%m-%d')"
+				);
+		if (StringUtils.isNotBlank(query.getSaleOrderNo())){
+			qw.like("bpc.saleOrderNo",query.getSaleOrderNo());
+		}
+		if (StringUtils.isNotBlank(query.getBusinessType())){
+			qw.like("bpc.businessType",query.getBusinessType());
+		}
+		if (StringUtils.isNotBlank(query.getApplyDeptSid())){
+			qw.eq("bpc.applyDeptSid",query.getApplyDeptSid());
+		}
+		if (StringUtils.isNotBlank(query.getApplyPeoName())){
+			qw.like("bpc.applyPeoName",query.getApplyPeoName());
+		}
+		if (StringUtils.isNotBlank(query.getModelName())){
+			qw.like("bpc.modelName",query.getModelName());
+		}
+		if (StringUtils.isNotBlank(query.getConfigName())){
+			qw.like("bpc.configName",query.getConfigName());
+		}
+		IPage<BusPurchaseChannel> page = PagerUtil.queryToPage(pq);
+		IPage<BusPurchaseChannelVo> pagging = baseMapper.selectPageVo(page, qw);
+		PagerVo<BusPurchaseChannelVo> p = PagerUtil.pageToVo(pagging, null);
+		return p;
+	}
+	
+	public void saveOrUpdateDto(BusPurchaseChannelDto dto){
+        String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            this.insertByDto(dto);
+            return; 
+        } 
+		this.updateByDto(dto);
+	}
+	
+	public void insertByDto(BusPurchaseChannelDto dto){
+		BusPurchaseChannel entity = new BusPurchaseChannel();
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		entity.setState(1);
+		baseMapper.insert(entity);
+	}
+	
+	public void updateByDto(BusPurchaseChannelDto dto){
+          String dtoSid = dto.getSid();
+        if (StringUtils.isBlank(dtoSid)) {
+            return;
+        } 
+		BusPurchaseChannel entity = fetchBySid(dtoSid);
+		BeanUtil.copyProperties(dto, entity, "id", "sid");
+		baseMapper.updateById(entity);
+	}
+	
+	public BusPurchaseChannelDetailsVo fetchDetailsVoBySid(String sid){
+		BusPurchaseChannel entity = fetchBySid(sid);
+		BusPurchaseChannelDetailsVo vo = new BusPurchaseChannelDetailsVo();
+		BeanUtil.copyProperties(entity, vo);
+		return vo;
+	}
+
+	public ResultBean choice(List<BusPurchaseChannelDto> dto) {
+		ResultBean rb = ResultBean.fireFail();
+		for (BusPurchaseChannelDto busPurchaseChannelDto : dto) {
+			String purchaseOrderTypeKey = busPurchaseChannelDto.getPurchaseOrderTypeKey();
+			String purchaseOrderTypeValue = busPurchaseChannelDto.getPurchaseOrderTypeValue();
+			String sid = busPurchaseChannelDto.getSid();
+			baseMapper.choice(sid,purchaseOrderTypeKey,purchaseOrderTypeValue);
+		}
+		return rb.success().setMsg("选择成功");
+	}
+}

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

@@ -63,6 +63,8 @@ import com.yxt.anrui.base.common.utils.domain.BillNo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDto;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannel;
+import com.yxt.anrui.buscenter.api.buspurchasechannel.BusPurchaseChannelDto;
 import com.yxt.anrui.buscenter.api.bussalesorder.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.model.*;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.*;
@@ -98,6 +100,7 @@ import com.yxt.anrui.buscenter.api.bussalesvehicleorder.BusSalesVehicleOrderDto;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
 import com.yxt.anrui.buscenter.biz.busdepositvehicle.BusDepositVehicleService;
+import com.yxt.anrui.buscenter.biz.buspurchasechannel.BusPurchaseChannelService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdeposit.BusSalesOrderDepositService;
 import com.yxt.anrui.buscenter.biz.bussalesorderdiscount.BusSalesOrderDiscountService;
 import com.yxt.anrui.buscenter.biz.bussalesorderinsurance.BusSalesOrderInsuranceService;
@@ -126,6 +129,7 @@ import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
+import com.yxt.anrui.portal.api.sysstaffinfo.SysStaffinfoVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
@@ -151,6 +155,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
@@ -191,6 +196,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
     @Autowired
     private BusDepositFictitiousService busDepositFictitiousService;
     @Autowired
+    private BusPurchaseChannelService busPurchaseChannelService;
+    @Autowired
     private SysStaffOrgFeign sysStaffOrgFeign;
     @Autowired
     private SysUserFeign sysUserFeign;
@@ -3075,7 +3082,25 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         busSalesOrderVehicleService.insert(busSalesOrderVehicle);
                     }
                 }
-
+                //推送采购渠道待选择
+                BusPurchaseChannelDto busPurchaseChannelDto = new BusPurchaseChannelDto();
+                busPurchaseChannelDto.setSaleOrderSid(busSalesOrder.getSid());
+                busPurchaseChannelDto.setSaleOrderNo(busSalesOrder.getBillNo());
+                SysUserVo sysUserVo = sysUserFeign.selectByStaffsid(busSalesOrder.getStaffSid()).getData();
+                busPurchaseChannelDto.setApplyPeoSid(sysUserVo.getSid());
+                busPurchaseChannelDto.setApplyPeoName(busSalesOrder.getStaffName());
+                busPurchaseChannelDto.setApplyDeptSid(busSalesOrder.getOrgSid());
+                busPurchaseChannelDto.setApplyDeptName(busSalesOrder.getOrgName());
+                BusSalesOrderModel busSalesOrderModel = busSalesOrderModelService.selectByOrderSid(busSalesOrder.getSid());
+                busPurchaseChannelDto.setModelSid(busSalesOrderModel.getModelSid());
+                busPurchaseChannelDto.setModelName(busSalesOrderModel.getModelName());
+                busPurchaseChannelDto.setConfigSid(busSalesOrderModel.getModelConfigSid());
+                busPurchaseChannelDto.setConfigName(busSalesOrderModel.getModelConfig());
+                busPurchaseChannelDto.setUseOrgSid(busSalesOrder.getUseOrgSid());
+                busPurchaseChannelDto.setSaleOrderApproDate(DateUtil.format(new Date(),"yyyy-MM-dd"));
+                BusSalesOrderPrice busSalesOrderPrice = busSalesOrderPriceService.selectBySalesOrderSid(busSalesOrder.getSid());
+                busPurchaseChannelDto.setNum(busSalesOrderPrice.getQuantity().toString());
+                busPurchaseChannelService.saveOrUpdateDto(busPurchaseChannelDto);
             }
             return rb.success().setData(resultBean.getData());
         } else {

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

@@ -56,6 +56,7 @@ public enum ProcDefEnum {
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:2:867516"), //测试调账流程定义id
     SCMVEHICLERETURN("采购退库", "process_md8aeoap:2:867508"),//测试采购退库流程定义id
     SALESPOLICY("销售政策审批流程", "process_biw9gfh7:2:867524"),//测试销售政策流程定义id
+    BASEDISPACKAGEAPPLY("优惠包申请流程", "process_l8i6tqho:1:967504"),//测试优惠包申请流程定义id
     ;
 
     ProcDefEnum(String proDefName, String proDefId) {

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDetailsVo.java

@@ -0,0 +1,101 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+
+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: BaseDiscountpackageApplyVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyVo <br/>
+ * Description: 优惠包申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 视图数据详情", description = "优惠包申请 视图数据详情")
+public class AppDiscountpackageApplyDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("合同编号")
+    private String contractId; // 合同编号
+	@ApiModelProperty("申请人")
+    private String applyName; // 申请人
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+	@ApiModelProperty("车型名称")
+    private String model; // 车型名称
+	@ApiModelProperty("台数")
+    private String number; // 台数
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+	@ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("优惠包列表")
+    private List<AppDiscountpackagelistDetailsVo> appDiscountpackagelists; // 优惠包列表
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageApplyDto.java

@@ -0,0 +1,103 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+
+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: BaseDiscountpackageApplyDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyDto <br/>
+ * Description: 优惠包申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 数据传输对象", description = "优惠包申请 数据传输对象")
+public class AppDiscountpackageApplyDto implements Dto {
+
+    private String sid; // sid
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+	@ApiModelProperty("合同编号")
+    private String contractId; // 合同编号
+	@ApiModelProperty("申请人")
+    private String applyName; // 申请人
+	@ApiModelProperty("客户名称")
+    private String customerName; // 客户名称
+	@ApiModelProperty("申请日期")
+    private String applyDate; // 申请日期
+	@ApiModelProperty("创建组织sid")
+    private String createOrgSid; // 创建组织sid
+	@ApiModelProperty("创建组织名称")
+    private String createOrgName; // 创建组织名称
+	@ApiModelProperty("使用组织sid")
+    private String useOrgSid; // 使用组织sid
+	@ApiModelProperty("使用组织名称")
+    private String useOrgName; // 使用组织名称
+	@ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn; // 是否显示办理按钮 提交后不显示
+	@ApiModelProperty("车型名称")
+    private String model; // 车型名称
+	@ApiModelProperty("台数")
+    private String number; // 台数
+	@ApiModelProperty("流程定义的id")
+    private String procDefId; // 流程定义的id
+	@ApiModelProperty("环节定义的sid")
+    private String nodeSid; // 环节定义的sid
+	@ApiModelProperty("流程实例的sid")
+    private String procInstId; // 流程实例的sid
+	@ApiModelProperty("流程状态")
+    private String nodeState; // 流程状态
+	@ApiModelProperty("taskId")
+    private String taskId; // taskId
+	@ApiModelProperty("申请人组织路径")
+    private String orgSidPath; // 申请人组织路径
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("销售订单sid")
+    private String saleOrderSid;
+    @ApiModelProperty("成交价")
+    private String price;
+    @ApiModelProperty("优惠包列表")
+    private List<AppDiscountpackagelistDto> discountPackageList; // 优惠包列表
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFegin.java

@@ -0,0 +1,70 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.AppScmVehicleGressionFeignFallback;
+import com.yxt.anrui.terminal.api.supplychain.vehicleApply.flowable.VehicleApplyQuery;
+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 io.swagger.annotations.ApiParam;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+@Api(tags = "优惠包申请列表")
+@FeignClient(
+        contextId = "terminal-Discountpackage",
+        name = "anrui-terminal",
+        path = "/autoservice/v1/discountPackageApply",
+        fallback = AppScmVehicleGressionFeignFallback.class)
+public interface AppDiscountpackageFegin {
+
+    @ApiOperation("移动端-获取优惠包列表")
+    @PostMapping("/getDiscountManageApplyList")
+    @ResponseBody
+    ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(@RequestBody PagerQuery<AppDiscountpackageQuery> pq);
+
+    @ApiOperation("移动端-优惠包新增或修改")
+    @PostMapping("/saveDiscountPackageApplyInfo")
+    @ResponseBody
+    public ResultBean saveDiscountPackageApplyInfo(@RequestBody AppDiscountpackageApplyDto dto);
+
+    @ApiOperation("移动端-优惠包初始化回显")
+    @GetMapping("/getDiscountPackageApplyInfo")
+    @ResponseBody
+    public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(@RequestParam("sid") String sid);
+
+    @ApiOperation("提交入账申请")
+    @PostMapping("/submitDiscountPackageApplyInfo")
+    @ResponseBody
+    public ResultBean submitRecordApplication(@RequestBody @Valid SubmitBaseDiscountpackageApplyDto dto);
+
+    @ApiOperation(value = "办理（同意）")
+    @PutMapping("/agreeDiscountPackageApplyInfo")
+    @ResponseBody
+    public ResultBean complete(@Valid @RequestBody BaseDiscountpackageApplyCompleteDto dto);
+
+    @ApiOperation(value = "撤回流程")
+    @PutMapping(value = "/recallDiscountPackageApplyInfo")
+    @ResponseBody
+    public ResultBean revokeProcess(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "驳回任务")
+    @PutMapping(value = "/rejectDiscountPackageApplyInfo")
+    @ResponseBody
+    public ResultBean taskReject(@ApiParam(value = "工作流任务相关--请求参数") @RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation(value = "终止任务")
+    @PutMapping(value = "/stopDiscountPackageApplyInfo")
+    @ResponseBody
+    public ResultBean breakProcess(@RequestBody FlowTaskVo flowTaskVo);
+
+    @ApiOperation("获取流程操作标题")
+    @GetMapping("/getFlowOperateTitle")
+    @ResponseBody
+    ResultBean<String> getFlowOperateTitle(@SpringQueryMap DiscountpackageQuery discbountpackageQuery);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageFeginFallback.java

@@ -0,0 +1,54 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+
+public class AppDiscountpackageFeginFallback implements AppDiscountpackageFegin{
+
+    @Override
+    public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
+        return null;
+    }
+
+    @Override
+    public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
+        return null;
+    }
+
+    @Override
+    public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+        return null;
+    }
+
+    @Override
+    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+        return null;
+    }
+
+    @Override
+    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+        return null;
+    }
+
+    @Override
+    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+        return null;
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(DiscountpackageQuery discountpackageQuery) {
+        return null;
+    }
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageQuery.java

@@ -0,0 +1,20 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class AppDiscountpackageQuery implements Query {
+
+    @ApiModelProperty("userSid")
+    private String userSid;
+    @ApiModelProperty("组织机构sid")
+    private String orgPath;
+    @ApiModelProperty("合同编号 客户名称")
+    private String names;
+    @ApiModelProperty("申请日期")
+    private String date;
+    @ApiModelProperty("1待办 2已办")
+    private String type;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackageVo.java

@@ -0,0 +1,38 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@ApiModel(value = "优惠包 视图数据对象", description = "优惠包 视图数据对象")
+@Data
+public class AppDiscountpackageVo implements Vo {
+
+    @ApiModelProperty("优惠包sid")
+    private String sid;
+
+    @ApiModelProperty("合同编号")
+    private String contractId;
+
+    @ApiModelProperty("申请人")
+    private String applyName;
+
+    @ApiModelProperty("客户名称")
+    private String customerName;
+
+    @ApiModelProperty("流程状态")
+    private String nodeState;
+
+    @ApiModelProperty("申请日期")
+    private String applyDate;
+
+    @ApiModelProperty("是否显示办理按钮 提交后不显示")
+    private Boolean showHandleBtn;
+
+    @ApiModelProperty("车型名称")
+    private String model;
+
+    @ApiModelProperty("台数")
+    private String number;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackagelistDetailsVo.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+
+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: BaseDiscountpackagelistVo.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistVo <br/>
+ * Description: 优惠包申请 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 视图数据详情", description = "优惠包申请 视图数据详情")
+public class AppDiscountpackagelistDetailsVo implements Vo {
+
+    private String sid; // sid
+
+	@ApiModelProperty("价值")
+    private String price; // 价值
+	@ApiModelProperty("数量")
+    private String number; // 数量
+	@ApiModelProperty("说明")
+    private String explain; // 说明
+	@ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+	@ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+	@ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/AppDiscountpackagelistDto.java

@@ -0,0 +1,66 @@
+/*********************************************************
+ *********************************************************
+ ********************                  *******************
+ *************                                ************
+ *******                  _oo0oo_                  *******
+ ***                     o8888888o                     ***
+ *                       88" . "88                       *
+ *                       (| -_- |)                       *
+ *                       0\  =  /0                       *
+ *                     ___/`---'\___                     *
+ *                   .' \\|     |// '.                   *
+ *                  / \\|||  :  |||// \                  *
+ *                 / _||||| -:- |||||- \                 *
+ *                |   | \\\  -  /// |   |                *
+ *                | \_|  ''\---/''  |_/ |                *
+ *                \  .-\__  '-'  ___/-. /                *
+ *              ___'. .'  /--.--\  `. .'___              *
+ *           ."" '<  `.___\_<|>_/___.' >' "".            *
+ *          | | :  `- \`.;`\ _ /`;.`/ - ` : | |          *
+ *          \  \ `_.   \_ __\ /__ _/   .-` /  /          *
+ *      =====`-.____`.___ \_____/___.-`___.-'=====       *
+ *                        `=---='                        *
+ *      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~      *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+
+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: BaseDiscountpackagelistDto.java <br/>
+ * Class: com.yxt.anrui.base.api.basediscountpackagelist.BaseDiscountpackagelistDto <br/>
+ * Description: 优惠包申请 数据传输对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-12-08 17:04:45 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Data
+@ApiModel(value = "优惠包申请 数据传输对象", description = "优惠包申请 数据传输对象")
+public class AppDiscountpackagelistDto implements Dto {
+
+    private String sid; // sid
+
+	@ApiModelProperty("价值")
+    private String price; // 价值
+	@ApiModelProperty("数量")
+    private String number; // 数量
+	@ApiModelProperty("说明")
+    private String explain; // 说明
+	@ApiModelProperty("优惠表申请sid")
+    private String discountSid; // 优惠表申请sid
+	@ApiModelProperty("总价值")
+    private String totalPrice; // 总价值
+	@ApiModelProperty("优惠包名称")
+    private String discountName; // 优惠包名称
+
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/BaseDiscountpackageApplyCompleteDto.java

@@ -0,0 +1,45 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/28 9:01
+ * @Description
+ */
+@Data
+public class BaseDiscountpackageApplyCompleteDto implements Dto {
+    private static final long serialVersionUID = 3240453987322803352L;
+    @ApiModelProperty(value = "用户sid")
+    @NotBlank(message = "参数错误：userSid")
+    private String userSid;
+    @ApiModelProperty(value = "用户全路径sid")
+    @NotBlank(message = "参数错误：orgSidPath")
+    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;
+    @ApiModelProperty("调账车辆列表")
+    private List<BaseInternalPurchaseVehicle> baseInternalPurchaseVehicles; // 调账车辆列表
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/DiscountpackageQuery.java

@@ -0,0 +1,25 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/8/22 10:41
+ * @Description
+ */
+@Data
+public class DiscountpackageQuery implements Query {
+    private static final long serialVersionUID = -958211588485515933L;
+
+    @ApiModelProperty(value = "节点key")
+    private String taskDefKey;
+    @ApiModelProperty(value = "业务sid")
+    private String businessSid;
+    @ApiModelProperty(value = "0 上一环节  1下一环节")
+    @NotNull(message = "参数错误：next")
+    private Integer next;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/discountPackageApply/SubmitBaseDiscountpackageApplyDto.java

@@ -0,0 +1,18 @@
+package com.yxt.anrui.terminal.api.autoservice.discountPackageApply;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/6/27 13:38
+ * @Description
+ */
+@Data
+public class SubmitBaseDiscountpackageApplyDto extends AppDiscountpackageApplyDto {
+    private static final long serialVersionUID = 378585162071125756L;
+    @ApiModelProperty("流程实例id")
+    private String instanceId;
+    @ApiModelProperty("任务id")
+    private String taskId;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/contract/AppCommonContractListQuery.java

@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.base.contract;
+
+
+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: CommonContractQuery.java <br/>
+ * Class: com.yxt.anrui.base.api.commoncontract.CommonContractQuery <br/>
+ * Description: 合同表 查询条件. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2021-10-12 14:02:40 <br/>
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "合同表 查询条件", description = "合同表 查询条件")
+@Data
+public class AppCommonContractListQuery implements Query {
+
+    @ApiModelProperty("用户sid")
+    private String userSid;
+
+	@ApiModelProperty("组织路径")
+    private String orgPath;
+    
+	@ApiModelProperty("合同编号/客户名称")
+    private String names;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/contract/AppCommonContractListVo.java

@@ -0,0 +1,31 @@
+package com.yxt.anrui.terminal.api.base.contract;
+
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Description
+ * @Author liuguohui
+ * @Date 2021/10/21
+ */
+@Data
+public class AppCommonContractListVo implements Vo {
+
+    @ApiModelProperty("合同sid")
+    private String contractSid;
+    @ApiModelProperty("合同编号")
+    private String contractId;
+    @ApiModelProperty("客户名称")
+    private String customer;
+    @ApiModelProperty("车型名称")
+    private String model;
+    @ApiModelProperty("车型sid")
+    private String modelSid;
+    @ApiModelProperty("配置sid")
+    private String configSid;
+    @ApiModelProperty("车辆台数")
+    private String carNum;
+    @ApiModelProperty("成交价")
+    private String price;
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/contract/ContractFeign.java

@@ -0,0 +1,32 @@
+package com.yxt.anrui.terminal.api.base.contract;
+
+import com.yxt.anrui.terminal.api.base.common.CommonFeignFallback;
+import com.yxt.anrui.terminal.api.base.common.PublicModelVo;
+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.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/9 12:59
+ * @Description
+ */
+@Api(tags = "app公共")
+@FeignClient(
+        contextId = "anrui-terminal-Contract",
+        name = "anrui-terminal",
+        path = "/base/v1/contract",
+        fallback = CommonFeignFallback.class)
+public interface ContractFeign {
+
+    @ApiOperation("手机端获取合同列表")
+    @PostMapping("/getAppContractList")
+    @ResponseBody
+    public ResultBean<PagerVo<AppCommonContractListVo>> getContractList(@RequestBody PagerQuery<AppCommonContractListQuery> query);
+}

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/base/contract/ContractFeignFallback.java

@@ -0,0 +1,22 @@
+package com.yxt.anrui.terminal.api.base.contract;
+
+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;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/11/9 13:00
+ * @Description
+ */
+@Component
+public class ContractFeignFallback implements ContractFeign{
+
+    @Override
+    public ResultBean<PagerVo<AppCommonContractListVo>> getContractList(PagerQuery<AppCommonContractListQuery> query) {
+        return null;
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyRest.java

@@ -0,0 +1,65 @@
+package com.yxt.anrui.terminal.biz.autoservice.discountPackageApply;
+
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
+import com.yxt.anrui.terminal.api.autoservice.discountPackageApply.*;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+@Api(tags = "优惠包申请列表")
+@Controller
+@RequestMapping("/autoservice/v1/discountPackageApply")
+public class AppDiscountPackageApplyRest implements AppDiscountpackageFegin {
+
+    @Autowired
+    private AppDiscountPackageApplyService appDiscountPackageApplyService;
+
+    @Override
+    public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> pq) {
+        return appDiscountPackageApplyService.getDiscountManageApplyList(pq);
+    }
+
+    @Override
+    public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
+        return appDiscountPackageApplyService.saveDiscountPackageApplyInfo(dto);
+    }
+
+    @Override
+    public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
+        return appDiscountPackageApplyService.getDiscountPackageApplyInfo(sid);
+    }
+
+    @Override
+    public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
+        return appDiscountPackageApplyService.submitRecordApplication(dto);
+    }
+
+    @Override
+    public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+        return appDiscountPackageApplyService.complete(dto);
+    }
+
+    @Override
+    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+        return appDiscountPackageApplyService.revokeProcess(flowTaskVo);
+    }
+
+    @Override
+    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+        return appDiscountPackageApplyService.taskReject(flowTaskVo);
+    }
+
+    @Override
+    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+        return appDiscountPackageApplyService.breakProcess(flowTaskVo);
+    }
+
+    @Override
+    public ResultBean<String> getFlowOperateTitle(DiscountpackageQuery discountpackageQuery) {
+        return appDiscountPackageApplyService.getFlowOperateTitle(discountpackageQuery);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/discountPackageApply/AppDiscountPackageApplyService.java

@@ -0,0 +1,114 @@
+package com.yxt.anrui.terminal.biz.autoservice.discountPackageApply;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basediscountpackageapply.BaseDiscountpackageApplyFeign;
+import com.yxt.anrui.base.api.basediscountpackageapply.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.busvehicleapply.flow.GetNodeVo;
+import com.yxt.anrui.base.api.flow.FlowTaskVo;
+import com.yxt.anrui.terminal.api.autoservice.discountPackageApply.*;
+import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.Collections;
+import java.util.List;
+
+@Service
+public class AppDiscountPackageApplyService {
+
+    @Autowired
+    private BaseDiscountpackageApplyFeign baseDiscountpackageApplyFeign;
+
+    public ResultBean<PagerVo<AppDiscountpackageVo>> getDiscountManageApplyList(PagerQuery<AppDiscountpackageQuery> query) {
+        ResultBean<PagerVo<AppDiscountpackageVo>> rb = ResultBean.fireFail();
+        PagerQuery<com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageQuery> pq = CoverUtils.getPagerQuery(query);
+        ResultBean<PagerVo<com.yxt.anrui.base.api.basediscountpackage.AppDiscountpackageVo>> discountManageApplyList = baseDiscountpackageApplyFeign.getDiscountManageApplyList(pq);
+        PagerVo<AppDiscountpackageVo> pagerVo = CoverUtils.selectPagerVo(discountManageApplyList.getData());
+        return rb.success().setData(pagerVo);
+    }
+
+    public ResultBean saveDiscountPackageApplyInfo(AppDiscountpackageApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        com.yxt.anrui.base.api.basediscountpackageapply.AppDiscountpackageApplyDto appDiscountpackageApplyDto = new com.yxt.anrui.base.api.basediscountpackageapply.AppDiscountpackageApplyDto();
+        BeanUtil.copyProperties(dto,appDiscountpackageApplyDto);
+        ResultBean resultBean = baseDiscountpackageApplyFeign.saveDiscountPackageApplyInfo(appDiscountpackageApplyDto);
+        if (resultBean.getSuccess() != true){
+            return rb.setMsg(resultBean.getMsg());
+        }
+        return rb.success().setMsg(resultBean.getMsg());
+    }
+
+    public ResultBean<AppDiscountpackageApplyDetailsVo> getDiscountPackageApplyInfo(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        ResultBean<com.yxt.anrui.base.api.basediscountpackageapply.AppDiscountpackageApplyDetailsVo> discountPackageApplyInfo = baseDiscountpackageApplyFeign.getDiscountPackageApplyInfo(sid);
+        AppDiscountpackageApplyDetailsVo appDiscountpackageApplyDetailsVo = new AppDiscountpackageApplyDetailsVo();
+        BeanUtil.copyProperties(discountPackageApplyInfo,appDiscountpackageApplyDetailsVo);
+        return rb.success().setData(appDiscountpackageApplyDetailsVo);
+    }
+
+    public ResultBean submitRecordApplication(SubmitBaseDiscountpackageApplyDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto submitBaseDiscountpackageApplyDto = new com.yxt.anrui.base.api.basediscountpackageapply.flow.SubmitBaseDiscountpackageApplyDto();
+        BeanUtil.copyProperties(dto,submitBaseDiscountpackageApplyDto);
+        baseDiscountpackageApplyFeign.submitRecordApplication(submitBaseDiscountpackageApplyDto);
+        return rb.success();
+    }
+
+    public ResultBean complete(BaseDiscountpackageApplyCompleteDto dto) {
+        ResultBean rb = ResultBean.fireFail();
+        com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto baseDiscountpackageApplyCompleteDto = new com.yxt.anrui.base.api.basediscountpackageapply.flow.BaseDiscountpackageApplyCompleteDto();
+        BeanUtil.copyProperties(dto,baseDiscountpackageApplyCompleteDto);
+        baseDiscountpackageApplyFeign.complete(baseDiscountpackageApplyCompleteDto);
+        return rb.success();
+    }
+
+    public ResultBean revokeProcess(FlowTaskVo flowTaskVo) {
+        ResultBean rb = ResultBean.fireFail();
+        baseDiscountpackageApplyFeign.revokeProcess(flowTaskVo);
+        return rb.success();
+    }
+
+    public ResultBean taskReject(FlowTaskVo flowTaskVo) {
+        ResultBean rb = ResultBean.fireFail();
+        baseDiscountpackageApplyFeign.taskReject(flowTaskVo);
+        return rb.success();
+    }
+
+    public ResultBean breakProcess(FlowTaskVo flowTaskVo) {
+        ResultBean rb = ResultBean.fireFail();
+        baseDiscountpackageApplyFeign.breakProcess(flowTaskVo);
+        return rb.success();
+    }
+
+    public ResultBean<String> getFlowOperateTitle(DiscountpackageQuery discountpackageQuery) {
+        ResultBean<String> rb = ResultBean.fireFail();
+        //0 上一环节  1下一环节
+        int next = discountpackageQuery.getNext();
+        GetNodeQuery getNodeQuery = new GetNodeQuery();
+        BeanUtil.copyProperties(discountpackageQuery, getNodeQuery);
+        String data = "";
+        if (next == 0) {
+            ResultBean<List<GetNodeVo>> getPreviousNodesForReject = baseDiscountpackageApplyFeign.getPreviousNodesForReject(getNodeQuery);
+            if (getPreviousNodesForReject.getSuccess()) {
+                getPreviousNodesForReject.getData().removeAll(Collections.singleton(null));
+                data = getPreviousNodesForReject.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getPreviousNodesForReject.getMsg());
+            }
+        } else if (next == 1) {
+            ResultBean<List<GetNodeVo>> getNextNodesForSubmit = baseDiscountpackageApplyFeign.getNextNodesForSubmit(getNodeQuery);
+            if (getNextNodesForSubmit.getSuccess()) {
+                getNextNodesForSubmit.getData().removeAll(Collections.singleton(null));
+                data = getNextNodesForSubmit.getData().get(0).getName();
+            } else {
+                return rb.setMsg(getNextNodesForSubmit.getMsg());
+            }
+        } else {
+            return rb.setMsg("参数错误：next");
+        }
+        return rb.success().setData(data);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/contract/ContractRest.java

@@ -0,0 +1,28 @@
+package com.yxt.anrui.terminal.biz.base.contract;
+
+import com.yxt.anrui.terminal.api.base.contract.AppCommonContractListQuery;
+import com.yxt.anrui.terminal.api.base.contract.AppCommonContractListVo;
+import com.yxt.anrui.terminal.api.base.contract.ContractFeign;
+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 org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.List;
+
+@Api(tags = "app公共")
+@Controller
+@RequestMapping("/base/v1/contract")
+public class ContractRest implements ContractFeign {
+
+    @Autowired
+    private ContractService contractService;
+
+    @Override
+    public ResultBean<PagerVo<AppCommonContractListVo>> getContractList(PagerQuery<AppCommonContractListQuery> query) {
+        return contractService.getContractList(query);
+    }
+}

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/base/contract/ContractService.java

@@ -0,0 +1,30 @@
+package com.yxt.anrui.terminal.biz.base.contract;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basevehicle.VehicleModelPriceQuery;
+import com.yxt.anrui.base.api.basevehicle.VehicleModelPriceVo;
+import com.yxt.anrui.base.api.commoncontract.CommonContractFeign;
+import com.yxt.anrui.terminal.api.base.contract.AppCommonContractListQuery;
+import com.yxt.anrui.terminal.api.base.contract.AppCommonContractListVo;
+import com.yxt.anrui.terminal.api.supplychain.stock.AppStockPageVo;
+import com.yxt.anrui.terminal.config.CoverUtils;
+import com.yxt.common.core.query.PagerQuery;
+import com.yxt.common.core.result.ResultBean;
+import com.yxt.common.core.vo.PagerVo;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class ContractService {
+
+    @Autowired
+    private CommonContractFeign commonContractFeign;
+
+    public ResultBean<PagerVo<AppCommonContractListVo>> getContractList(PagerQuery<AppCommonContractListQuery> query) {
+        ResultBean<PagerVo<AppCommonContractListVo>> rb = ResultBean.fireFail();
+        PagerQuery<com.yxt.anrui.base.api.commoncontract.AppCommonContractListQuery> pq = CoverUtils.getPagerQuery(query);
+        ResultBean<PagerVo<com.yxt.anrui.base.api.commoncontract.AppCommonContractListVo>> appContractList = commonContractFeign.getAppContractList(pq);
+        PagerVo<AppCommonContractListVo> vo = CoverUtils.selectPagerVo(appContractList.getData());
+        return rb.success().setData(vo);
+    }
+}