diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeign.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeign.java
new file mode 100644
index 0000000000..9728cbcf98
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeign.java
@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+import com.yxt.anrui.base.api.basemodelmodprice.*;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceCompleteDto;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
+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.cloud.openfeign.SpringQueryMap;
+import org.springframework.web.bind.annotation.*;
+
+import javax.validation.Valid;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceFeign.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeign
+ * Description: 车型调价申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请表")
+@FeignClient(
+ contextId = "anrui-base-BaseModelModprice",
+ name = "anrui-terminal",
+ path = "/supplychain/v1/modelAdjust",
+ fallback = AppBaseModelModpriceFeignFallback.class)
+public interface AppBaseModelModpriceFeign {
+
+ @ApiOperation("获取车型调车详情")
+ @GetMapping("/getModelAdjust/{sid}")
+ public ResultBean getModelAdjust(@PathVariable("sid") String sid);
+
+ /*****************************车型调价流程****************************************************/
+
+ @ApiOperation("提交车型调价流程")
+ @PostMapping("/submitModelAdjustInfo")
+ public ResultBean submitModelAdjustInfo(@Valid @RequestBody SubmitModelModPriceDto dto);
+
+ @ApiOperation(value = "办理（同意）")
+ @PutMapping("/agreeModelAdjustInfo")
+ public ResultBean agreeModelAdjustInfo(@Valid @RequestBody ModelModPriceCompleteDto query);
+
+ @ApiOperation(value = "驳回任务")
+ @PutMapping(value = "/rejectModelAdjustInfo")
+ public ResultBean rejectModelAdjustInfo(@Valid @RequestBody ModelModPriceTaskQuery query);
+
+ @ApiOperation(value = "撤回流程")
+ @PutMapping(value = "/recallModelAdjustInfo")
+ public ResultBean recallModelAdjustInfo(@Valid @RequestBody ModelModPriceTaskQuery query);
+
+ @ApiOperation(value = "终止任务")
+ @PutMapping(value = "/stopModelAdjustInfo")
+ public ResultBean stopModelAdjustInfo(@Valid @RequestBody ModelModPriceTaskQuery query);
+
+ @ApiOperation("获取流程操作标题")
+ @GetMapping("/getFlowOperateTitle")
+ @ResponseBody
+ ResultBean getFlowOperateTitle(@SpringQueryMap ModelModpriceQuery query);
+}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeignFallback.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeignFallback.java
new file mode 100644
index 0000000000..7cf5a0ed05
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/AppBaseModelModpriceFeignFallback.java
@@ -0,0 +1,96 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+import com.yxt.anrui.base.api.basemodelmodprice.*;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceCompleteDto;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
+import com.yxt.anrui.terminal.api.supplychain.scmvehiclegression.flowable.GressionQuery;
+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;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceFeignFallback.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeignFallback
+ * Description: 车型调价申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Component
+public class AppBaseModelModpriceFeignFallback implements AppBaseModelModpriceFeign {
+
+ @Override
+ public ResultBean getModelAdjust(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("/getModelAdjust无法访问");
+ }
+
+ @Override
+ public ResultBean submitModelAdjustInfo(SubmitModelModPriceDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("/submitModelAdjustInfo无法访问");
+ }
+
+ @Override
+ public ResultBean agreeModelAdjustInfo(ModelModPriceCompleteDto query) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("/agreeModelAdjustInfo无法访问");
+ }
+
+ @Override
+ public ResultBean rejectModelAdjustInfo(ModelModPriceTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("/rejectModelAdjustInfo无法访问");
+ }
+
+ @Override
+ public ResultBean recallModelAdjustInfo(ModelModPriceTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("/recallModelAdjustInfo无法访问");
+ }
+
+ @Override
+ public ResultBean stopModelAdjustInfo(ModelModPriceTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("/stopModelAdjustInfo无法访问");
+ }
+
+ @Override
+ public ResultBean getFlowOperateTitle(ModelModpriceQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ return rb.setMsg("/getFlowOperateTitle无法访问");
+ }
+}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceCompleteDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceCompleteDto.java
new file mode 100644
index 0000000000..04ad62fef8
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceCompleteDto.java
@@ -0,0 +1,39 @@
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.util.Map;
+
+@Data
+public class ModelModPriceCompleteDto implements Dto {
+ private static final long serialVersionUID = 3688203427193836060L;
+
+ @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")
+ @JsonProperty("procInsId")
+ private String instanceId;
+ @ApiModelProperty(value = "意见")
+ @NotBlank(message = "参数错误：comment")
+ private String comment;
+ @ApiModelProperty(value = "业务sid")
+ @NotBlank(message = "参数错误：businessSid")
+ private String businessSid;
+ @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？")
+ private Map formVariables;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceTaskQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceTaskQuery.java
new file mode 100644
index 0000000000..1d0e1d1d35
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModPriceTaskQuery.java
@@ -0,0 +1,43 @@
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+@Data
+public class ModelModPriceTaskQuery implements Query {
+ private static final long serialVersionUID = 4925904324021287070L;
+
+ /**
+ * 终止、驳回、撤回
+ */
+ @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")
+ @JsonProperty("procInsId")
+ private String instanceId;
+
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDetailVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDetailVo.java
new file mode 100644
index 0000000000..e52a673cff
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDetailVo.java
@@ -0,0 +1,40 @@
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelVo;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class ModelModpriceDetailVo implements Vo {
+
+ private static final long serialVersionUID = -2797496175043705271L;
+ @ApiModelProperty("sid")
+ private String sid; // sid
+ @ApiModelProperty("申请日期")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @JsonProperty("date")
+ private Date createTime; // 申请日期
+ @ApiModelProperty("申请人姓名")
+ @JsonProperty("applyName")
+ private String applyPeoName; // 申请人姓名
+ @ApiModelProperty("调价原因")
+ @JsonProperty("reason")
+ private String modpriceReason; // 调价原因
+ @ApiModelProperty(value = "任务id")
+ private String taskId;
+ @ApiModelProperty(value = "流程实例id")
+ @JsonProperty("procInsId")
+ private String procInstId;
+ @ApiModelProperty(value = "创建人sid")
+ @JsonProperty("userSid")
+ private String createBySid;
+ @ApiModelProperty("调价申请车型列表")
+ private List baseModelModpriceModels; // 调价申请车型列表
+
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDto.java
new file mode 100644
index 0000000000..c443028bd1
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceDto.java
@@ -0,0 +1,73 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceDto.java
+ * Class: com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceDto
+ * Description: 车型调价申请表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请表 数据传输对象", description = "车型调价申请表 数据传输对象")
+@Data
+public class ModelModpriceDto implements Dto {
+
+ private static final long serialVersionUID = -4989265293886127927L;
+ @ApiModelProperty("sid")
+ private String sid; // sid
+ @ApiModelProperty("创建人sid")
+ @JsonProperty("userSid")
+ private String createBySid; // 创建人sid
+ @ApiModelProperty("申请人姓名")
+ @JsonProperty("applyName")
+ private String applyPeoName; // 申请人姓名
+ @ApiModelProperty("调价原因")
+ @JsonProperty("reason")
+ private String modpriceReason; // 调价原因
+ @ApiModelProperty("使用组织sid")
+ private String useOrgSid; // 使用组织sid
+ @ApiModelProperty("创建组织sid")
+ private String createOrgSid; // 创建组织sid
+ @ApiModelProperty("调价申请车型列表")
+ private List baseModelModpriceModels; // 调价申请车型列表
+}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelDto.java
new file mode 100644
index 0000000000..6aed5268f3
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelDto.java
@@ -0,0 +1,74 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceModelDto.java
+ * Class: com.yxt.anrui.base.api.basemodelmodpricemodel.BaseModelModpriceModelDto
+ * Description: 车型调价申请车型表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@ApiModel(value = "车型调价申请车型表 数据传输对象", description = "车型调价申请车型表 数据传输对象")
+@Data
+public class ModelModpriceModelDto implements Dto {
+
+ private static final long serialVersionUID = -6330872454593364594L;
+ @ApiModelProperty("车型调价申请sid")
+ private String mainSid; // 车型调价申请sid
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+ @ApiModelProperty("车型别名")
+ @JsonProperty("modelName")
+ private String vehicleAlias; // 车型别名
+ @ApiModelProperty("常用配置sid")
+ private String configSid; // 常用配置sid
+ @ApiModelProperty("常用配置名称")
+ private String configName; // 常用配置名称
+ @ApiModelProperty("成本价")
+ private String costPrice; // 成本价
+ @ApiModelProperty("现销售指导价")
+ @JsonProperty("guidancePrice")
+ private String guidedPrice; // 现销售指导价
+ @ApiModelProperty("价格增减数额")
+ @JsonProperty("adjustPrice")
+ private String incOrDecInPrice; // 价格增减数额
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+}
\ No newline at end of file
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelVo.java
new file mode 100644
index 0000000000..4147f613ca
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceModelVo.java
@@ -0,0 +1,34 @@
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.vo.Vo;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class ModelModpriceModelVo implements Vo {
+ private static final long serialVersionUID = -6413746700501795794L;
+
+ @ApiModelProperty("车型调价申请sid")
+ private String mainSid; // 车型调价申请sid
+ @ApiModelProperty("车型sid")
+ private String modelSid; // 车型sid
+ @ApiModelProperty("车型别名")
+ @JsonProperty("modelName")
+ private String vehicleAlias; // 车型别名
+ @ApiModelProperty("常用配置sid")
+ private String configSid; // 常用配置sid
+ @ApiModelProperty("常用配置名称")
+ private String configName; // 常用配置名称
+ @ApiModelProperty("成本价")
+ private String costPrice; // 成本价
+ @ApiModelProperty("现销售指导价")
+ @JsonProperty("guidancePrice")
+ private String guidedPrice; // 现销售指导价
+ @ApiModelProperty("价格增减数额")
+ @JsonProperty("adjustPrice")
+ private String incOrDecInPrice; // 价格增减数额
+ @ApiModelProperty("备注")
+ private String remarks; // 备注
+
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceQuery.java
new file mode 100644
index 0000000000..46c18b24fb
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/ModelModpriceQuery.java
@@ -0,0 +1,24 @@
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+import com.yxt.common.core.query.Query;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/7/28 10:48
+ * @Description
+ */
+@Data
+public class ModelModpriceQuery implements Query {
+ private static final long serialVersionUID = -668333972696058522L;
+ @ApiModelProperty(value = "节点key")
+ private String taskDefKey;
+ @ApiModelProperty(value = "业务sid")
+ private String businessSid;
+ @ApiModelProperty(value = "0 上一环节 1下一环节")
+ @NotNull(message = "参数错误：next")
+ private Integer next;
+}
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/SubmitModelModPriceDto.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/SubmitModelModPriceDto.java
new file mode 100644
index 0000000000..08a493c755
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/modelAdjust/SubmitModelModPriceDto.java
@@ -0,0 +1,19 @@
+package com.yxt.anrui.terminal.api.supplychain.modelAdjust;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SubmitModelModPriceDto extends ModelModpriceDto {
+ private static final long serialVersionUID = 3006301640675668128L;
+
+ @ApiModelProperty("意见")
+ private String comment;
+ @ApiModelProperty("流程实例id")
+ @JsonProperty("procInsId")
+ private String instanceId;
+ @ApiModelProperty("任务id")
+ private String taskId;
+}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceRest.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceRest.java
new file mode 100644
index 0000000000..823988a1a8
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceRest.java
@@ -0,0 +1,102 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.supplychain.modelAdjust;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basemodelmodprice.*;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceCompleteDto;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
+import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
+import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.terminal.api.supplychain.modelAdjust.*;
+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.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceRest
+ * Description: 车型调价申请表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Api(tags = "车型调价申请表")
+@Controller
+@RequestMapping("/supplychain/v1/modelAdjust")
+public class AppBaseModelModpriceRest implements AppBaseModelModpriceFeign {
+
+ @Autowired
+ private AppBaseModelModpriceService appBaseModelModpriceService;
+
+
+ @Override
+ public ResultBean getModelAdjust(String sid) {
+ return appBaseModelModpriceService.getModelAdjust(sid);
+ }
+
+ @Override
+ public ResultBean submitModelAdjustInfo(SubmitModelModPriceDto dto) {
+ return appBaseModelModpriceService.submitModelAdjustInfo(dto);
+ }
+
+ @Override
+ public ResultBean agreeModelAdjustInfo(ModelModPriceCompleteDto query) {
+ return appBaseModelModpriceService.agreeModelAdjustInfo(query);
+ }
+
+ @Override
+ public ResultBean rejectModelAdjustInfo(ModelModPriceTaskQuery query) {
+ return appBaseModelModpriceService.rejectModelAdjustInfo(query);
+ }
+
+ @Override
+ public ResultBean recallModelAdjustInfo(ModelModPriceTaskQuery query) {
+ return appBaseModelModpriceService.recallModelAdjustInfo(query);
+ }
+
+ @Override
+ public ResultBean stopModelAdjustInfo(ModelModPriceTaskQuery query) {
+ return appBaseModelModpriceService.stopModelAdjustInfo(query);
+ }
+
+ @Override
+ public ResultBean getFlowOperateTitle(ModelModpriceQuery query) {
+ return appBaseModelModpriceService.getFlowOperateTitle(query);
+ }
+}
diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java
new file mode 100644
index 0000000000..d8fcd88f04
--- /dev/null
+++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/modelAdjust/AppBaseModelModpriceService.java
@@ -0,0 +1,197 @@
+/*********************************************************
+ *********************************************************
+ ******************** *******************
+ ************* ************
+ ******* _oo0oo_ *******
+ *** o8888888o ***
+ * 88" . "88 *
+ * (| -_- |) *
+ * 0\ = /0 *
+ * ___/`---'\___ *
+ * .' \\| |// '. *
+ * / \\||| : |||// \ *
+ * / _||||| -:- |||||- \ *
+ * | | \\\ - /// | | *
+ * | \_| ''\---/'' |_/ | *
+ * \ .-\__ '-' ___/-. / *
+ * ___'. .' /--.--\ `. .'___ *
+ * ."" '< `.___\_<|>_/___.' >' "". *
+ * | | : `- \`.;`\ _ /`;.`/ - ` : | | *
+ * \ \ `_. \_ __\ /__ _/ .-` / / *
+ * =====`-.____`.___ \_____/___.-`___.-'===== *
+ * `=---=' *
+ * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
+ *********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
+ *********************************************************/
+package com.yxt.anrui.terminal.biz.supplychain.modelAdjust;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceDetailVo;
+import com.yxt.anrui.base.api.basemodelmodprice.BaseModelModpriceFeign;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceCompleteDto;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.BaseModelModPriceTaskQuery;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.SubmitBaseModelModPriceDto;
+import com.yxt.anrui.base.api.basemodelmodprice.flow.GetNodeQuery;
+import com.yxt.anrui.scm.api.scmvehiclegression.flowable.GetNodeVo;
+import com.yxt.anrui.terminal.api.supplychain.modelAdjust.*;
+import com.yxt.anrui.terminal.api.supplychain.scmvehicleenterlibrary.AppEnterlibraryInfoVo;
+import com.yxt.common.core.result.ResultBean;
+import org.omg.CORBA.BAD_CONTEXT;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.math.BigDecimal;
+import java.util.*;
+import java.util.stream.Collectors;
+
+/**
+ * Project: anrui-base(车型调价申请)
+ * File: BaseModelModpriceService.java
+ * Class: com.yxt.anrui.base.biz.basemodelmodprice.BaseModelModpriceService
+ * Description: 车型调价申请表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-06-15 09:11:09
+ *
+ * @author liupopo
+ * @version 1.0
+ * @since 1.0
+ */
+@Service
+public class AppBaseModelModpriceService {
+
+ @Autowired
+ BaseModelModpriceFeign baseModelModpriceFeign;
+
+ /**
+ * 获取车型调车详情
+ *
+ * @param sid
+ * @return
+ */
+ public ResultBean getModelAdjust(String sid) {
+ ResultBean rb = ResultBean.fireFail();
+ ModelModpriceDetailVo vo = new ModelModpriceDetailVo();
+ ResultBean resultBean = baseModelModpriceFeign.fetchBySid(sid);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ BaseModelModpriceDetailVo baseModelModpriceDetailVo = resultBean.getData();
+ BeanUtil.copyProperties(baseModelModpriceDetailVo, vo);
+ return rb.success().setData(vo);
+ }
+
+ /**
+ * 提交提交接口
+ *
+ * @param dto
+ * @return
+ */
+ public ResultBean submitModelAdjustInfo(SubmitModelModPriceDto dto) {
+ ResultBean rb = ResultBean.fireFail();
+ SubmitBaseModelModPriceDto submitBaseModelModPriceDto = new SubmitBaseModelModPriceDto();
+ BeanUtil.copyProperties(dto, submitBaseModelModPriceDto);
+ ResultBean resultBean = baseModelModpriceFeign.submitBaseModelModPrice(submitBaseModelModPriceDto);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ return rb.success();
+ }
+
+ /**
+ * 同意
+ *
+ * @param query
+ * @return
+ */
+ public ResultBean agreeModelAdjustInfo(ModelModPriceCompleteDto query) {
+ ResultBean rb = ResultBean.fireFail();
+ BaseModelModPriceCompleteDto baseModelModPriceCompleteDto = new BaseModelModPriceCompleteDto();
+ BeanUtil.copyProperties(query, baseModelModPriceCompleteDto);
+ ResultBean resultBean = baseModelModpriceFeign.complete(baseModelModPriceCompleteDto);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ return rb.success();
+ }
+
+ /**
+ * 驳回任务
+ *
+ * @param query
+ * @return
+ */
+ public ResultBean rejectModelAdjustInfo(ModelModPriceTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ BaseModelModPriceTaskQuery baseModelModPriceTaskQuery = new BaseModelModPriceTaskQuery();
+ BeanUtil.copyProperties(query, baseModelModPriceTaskQuery);
+ ResultBean resultBean = baseModelModpriceFeign.taskReject(baseModelModPriceTaskQuery);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ return rb.success();
+ }
+
+ /**
+ * 撤回流程
+ *
+ * @param query
+ * @return
+ */
+ public ResultBean recallModelAdjustInfo(ModelModPriceTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ BaseModelModPriceTaskQuery baseModelModPriceTaskQuery = new BaseModelModPriceTaskQuery();
+ BeanUtil.copyProperties(query, baseModelModPriceTaskQuery);
+ ResultBean resultBean = baseModelModpriceFeign.revokeProcess(baseModelModPriceTaskQuery);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ return rb.success();
+ }
+
+ /**
+ * 终止任务
+ *
+ * @param query
+ * @return
+ */
+ public ResultBean stopModelAdjustInfo(ModelModPriceTaskQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ BaseModelModPriceTaskQuery baseModelModPriceTaskQuery = new BaseModelModPriceTaskQuery();
+ BeanUtil.copyProperties(query, baseModelModPriceTaskQuery);
+ ResultBean resultBean = baseModelModpriceFeign.breakProcess(baseModelModPriceTaskQuery);
+ if (!resultBean.getSuccess()) {
+ return rb.setMsg(resultBean.getMsg());
+ }
+ return rb.success();
+ }
+
+ public ResultBean getFlowOperateTitle(ModelModpriceQuery query) {
+ ResultBean rb = ResultBean.fireFail();
+ //0 上一环节 1下一环节
+ int next = query.getNext();
+ GetNodeQuery getNodeQuery = new GetNodeQuery();
+ BeanUtil.copyProperties(query, getNodeQuery);
+ String data = "";
+ if (next == 0) {
+ ResultBean> getPreviousNodesForReject = baseModelModpriceFeign.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> getNextNodesForSubmit = baseModelModpriceFeign.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);
+ }
+}
\ No newline at end of file