diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java new file mode 100644 index 0000000000..e9a9eeec61 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimit.java @@ -0,0 +1,64 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basebrandletpricepowimit; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimit.java
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimit
+ * Description: 品牌让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌让价权限表", description = "品牌让价权限表") +@TableName("base_brandletpricepowimit") +public class BaseBrandletpricepowimit extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDetailsVo.java new file mode 100644 index 0000000000..46ab2d1525 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDetailsVo.java @@ -0,0 +1,70 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basebrandletpricepowimit; + + +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto; +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimitVo.java
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo
+ * Description: 品牌让价权限表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌让价权限表 视图数据详情", description = "品牌让价权限表 视图数据详情") +public class BaseBrandletpricepowimitDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("角色让价权限") + private List baseRoleletpricepowimits; +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java new file mode 100644 index 0000000000..ff3e17f6ff --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitDto.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basebrandletpricepowimit; + + +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto; +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimitDto.java
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDto
+ * Description: 品牌让价权限表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌让价权限表 数据传输对象", description = "品牌让价权限表 数据传输对象") +public class BaseBrandletpricepowimitDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + @ApiModelProperty("创建组织sid") + private String createOrgSid; // 创建组织sid + @ApiModelProperty("角色让价权限") + private List baseRoleletpricepowimits; +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitFeign.java new file mode 100644 index 0000000000..d95cab3c2b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basebrandletpricepowimit; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimitFeign.java
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign
+ * Description: 品牌让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "品牌让价权限表") +@FeignClient( + contextId = "anrui-base-BaseBrandletpricepowimit", + name = "anrui-base", + path = "v1/basebrandletpricepowimit", + fallback = BaseBrandletpricepowimitFeignFallback.class) +public interface BaseBrandletpricepowimitFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody BaseBrandletpricepowimitDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitFeignFallback.java new file mode 100644 index 0000000000..f43534aff3 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basebrandletpricepowimit; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimitFeignFallback.java
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeignFallback
+ * Description: 品牌让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BaseBrandletpricepowimitFeignFallback implements BaseBrandletpricepowimitFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/basebrandletpricepowimit/listPage无法访问"); + } + + @Override + public ResultBean save(BaseBrandletpricepowimitDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-base/basebrandletpricepowimit/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-base/basebrandletpricepowimit/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/basebrandletpricepowimit/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitQuery.java new file mode 100644 index 0000000000..b5c349e98a --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitQuery.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basebrandletpricepowimit; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimitQuery.java
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitQuery
+ * Description: 品牌让价权限表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌让价权限表 查询条件", description = "品牌让价权限表 查询条件") +public class BaseBrandletpricepowimitQuery implements Query { + + @ApiModelProperty("组织全路径") + private String orgSidPath; // 组织全路径 + @ApiModelProperty("品牌sid") + private String brandSid; // 品牌sid + @ApiModelProperty("分公司sid") + private String useOrgSid; // 分公司sid +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitVo.java new file mode 100644 index 0000000000..86588e7c0b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basebrandletpricepowimit/BaseBrandletpricepowimitVo.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basebrandletpricepowimit; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimitVo.java
+ * Class: com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo
+ * Description: 品牌让价权限表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "品牌让价权限表 视图数据对象", description = "品牌让价权限表 视图数据对象") +public class BaseBrandletpricepowimitVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("角色让价权限") + private String roleLetPrice; // 角色让价权限 + @ApiModelProperty("品牌名称") + private String brandName; // 品牌名称 + @ApiModelProperty("分公司名称") + private String useOrgName; // 分公司名称 + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java index 9c81abb128..294e732b00 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackage.java @@ -60,4 +60,15 @@ public class BaseDiscountpackage extends BaseEntity { @ApiModelProperty("使用组织") private String useOrgName; + + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("流程实例的sid") + private String procInstId; + @ApiModelProperty("任务id") + private String taskId; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java index eff4d0f818..e06fc2e52d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageDto.java @@ -1,12 +1,15 @@ package com.yxt.anrui.base.api.basediscountpackage; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto; import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: base_discountpackage(优惠包)
* File: BaseDiscountpackageDto.java
@@ -63,9 +66,23 @@ public class BaseDiscountpackageDto implements Dto { @ApiModelProperty("使用组织") private String useOrgName; - @ApiModelProperty("用户sid") - private String userSid; + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("业务员sid") private String staffSid; + + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("流程实例的sid") + private String procInstId; + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("销售车辆列表") + private List baseDiscountpackageVehs; } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java index 5036f8fc7f..6043c4aadf 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeign.java @@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.basediscountpackage; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; +import com.yxt.anrui.base.api.basediscountpackage.flow.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -73,4 +74,40 @@ public interface BaseDiscountpackageFeign { @ApiOperation("移动端-销售订单获取销售政策优惠包:切换机构") @GetMapping("/getAppPackage") ResultBean> getAppPackage(@SpringQueryMap AppBaseDiscountpackageQuery appBaseDiscountpackageQuery); + + /*****************************销售政策流程****************************************************/ + + @ApiOperation("提交销售政策流程") + @PostMapping("/submitBaseDiscountpackage") + public ResultBean submitBaseDiscountpackage(@Valid @RequestBody SubmitBaseDiscountpackageDto dto); + + /** + * @param bvd + * @return + */ + @ApiOperation(value = "办理（同意）") + @PostMapping("/complete") + public ResultBean complete(@Valid @RequestBody BaseDiscountpackageCompleteDto bvd); + + @ApiOperation(value = "获取下一个环节") + @GetMapping(value = "/getNextNodesForSubmit") + ResultBean> getNextNodesForSubmit(@Valid @SpringQueryMap GetNodeQuery query); + + @ApiOperation(value = "获取上一个环节") + @GetMapping(value = "/getPreviousNodesForReject") + ResultBean> getPreviousNodesForReject(@Valid @SpringQueryMap GetNodeQuery query); + + @ApiOperation(value = "驳回任务") + @PostMapping(value = "/reject") + public ResultBean taskReject(@Valid @RequestBody BaseDiscountpackageTaskQuery query); + + @ApiOperation(value = "撤回流程") + @PostMapping(value = "/revokeProcess") + public ResultBean revokeProcess(@Valid @RequestBody BaseDiscountpackageTaskQuery query); + + @ApiOperation(value = "终止任务") + @PostMapping(value = "/breakProcess") + public ResultBean breakProcess(@Valid @RequestBody BaseDiscountpackageTaskQuery query); + + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java index bfead9ee79..e7a1fc9308 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageFeignFallback.java @@ -2,6 +2,7 @@ package com.yxt.anrui.base.api.basediscountpackage; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; +import com.yxt.anrui.base.api.basediscountpackage.flow.*; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; @@ -71,5 +72,40 @@ public class BaseDiscountpackageFeignFallback implements BaseDiscountpackageFeig return null; } + @Override + public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) { + return null; + } + + @Override + public ResultBean complete(BaseDiscountpackageCompleteDto bvd) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean taskReject(BaseDiscountpackageTaskQuery query) { + return null; + } + + @Override + public ResultBean revokeProcess(BaseDiscountpackageTaskQuery query) { + return null; + } + + @Override + public ResultBean breakProcess(BaseDiscountpackageTaskQuery query) { + return null; + } + } \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java index bae455b6fd..aecd755de9 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackagePageListVo.java @@ -46,4 +46,14 @@ public class BaseDiscountpackagePageListVo implements Vo { @ApiModelProperty("使用组织") private String useOrgName; + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("流程实例的sid") + private String procInstId; + @ApiModelProperty("任务id") + private String taskId; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java index 0fab058386..fe6e554608 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/BaseDiscountpackageVo.java @@ -1,12 +1,16 @@ package com.yxt.anrui.base.api.basediscountpackage; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.List; + /** * Project: base_discountpackage(优惠包)
* File: BaseDiscountpackageVo.java
@@ -27,6 +31,9 @@ public class BaseDiscountpackageVo implements Vo { @ApiModelProperty("优惠情况") private String sid; + @ApiModelProperty("创建人sid") + private String createBySid; + @ApiModelProperty("优惠类型key") private String discountTypeKey; @@ -62,4 +69,18 @@ public class BaseDiscountpackageVo implements Vo { @ApiModelProperty("使用组织") private String useOrgName; + + @ApiModelProperty("流程定义的id") + private String procDefId; + @ApiModelProperty("环节定义的sid") + private String nodeSid; + @ApiModelProperty("流程状态") + private String nodeState; + @ApiModelProperty("流程实例的sid") + private String procInstId; + @ApiModelProperty("任务id") + private String taskId; + + @ApiModelProperty("销售车辆列表") + private List baseDiscountpackageVehs; } diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/BaseDiscountpackageCompleteDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/BaseDiscountpackageCompleteDto.java new file mode 100644 index 0000000000..d40d99adc1 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/BaseDiscountpackageCompleteDto.java @@ -0,0 +1,43 @@ +package com.yxt.anrui.base.api.basediscountpackage.flow; + +import com.yxt.common.core.dto.Dto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 9:01 + * @Description + */ +@Data +public class BaseDiscountpackageCompleteDto implements Dto { + private static final long serialVersionUID = 3240453987322803352L; + @ApiModelProperty(value = "用户sid") + @NotBlank(message = "参数错误：userSid") + private String userSid; + @ApiModelProperty(value = "用户全路径sid") + @NotBlank(message = "用户全路径不能为空") + private String orgSidPath; + @ApiModelProperty(value = "节点id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + @ApiModelProperty(value = "任务id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + @ApiModelProperty(value = "流程id") + @NotBlank(message = "参数错误：instanceId") + private String instanceId; + @ApiModelProperty(value = "意见") + @NotBlank(message = "参数错误：comment") + private String comment; + @ApiModelProperty(value = "业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + @ApiModelProperty(value = "暂不确定是不是需要前端传的：还是有分支的时候传？？") + private Map formVariables; + + private String orgPath; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/BaseDiscountpackageTaskQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/BaseDiscountpackageTaskQuery.java new file mode 100644 index 0000000000..0d7853a041 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/BaseDiscountpackageTaskQuery.java @@ -0,0 +1,56 @@ +package com.yxt.anrui.base.api.basediscountpackage.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +/** + * @Author dimengzhe + * @Date 2022/6/28 17:29 + * @Description 终止、撤回、驳回查询参数 + */ +@Data +public class BaseDiscountpackageTaskQuery implements Query { + private static final long serialVersionUID = -4006020771892400451L; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("任务Id") + @NotBlank(message = "参数错误：taskId") + private String taskId; + /** + * 终止、驳回、撤回 + */ + @ApiModelProperty("业务sid") + @NotBlank(message = "参数错误：businessSid") + private String businessSid; + /** + * 终止、驳回 + */ + @ApiModelProperty("任务意见") + private String comment; + /** + * 终止、撤回 + */ + @ApiModelProperty("用户Sid") + private String userSid; + /** + * 终止 + */ + @ApiModelProperty("流程实例Id") + private String instanceId; + /*@ApiModelProperty("用户Id") + private String userId; + @ApiModelProperty("节点") + private String targetKey; + @ApiModelProperty("流程变量信息") + private Map values = new HashMap<>(); + @ApiModelProperty("审批人") + private String assignee; + @ApiModelProperty("候选人") + private List candidateUsers = new ArrayList<>(); + @ApiModelProperty("审批组") + private List candidateGroups = new ArrayList<>();*/ +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/GetNodeQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/GetNodeQuery.java new file mode 100644 index 0000000000..bd3292d925 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/GetNodeQuery.java @@ -0,0 +1,28 @@ +package com.yxt.anrui.base.api.basediscountpackage.flow; + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.util.Map; + +/** + * @Author dimengzhe + * @Date 2022/6/28 10:42 + * @Description + */ +@Data +public class GetNodeQuery implements Query { + private static final long serialVersionUID = -5674867230708197611L; + + @ApiModelProperty(value = "环节定义id") + @NotBlank(message = "参数错误：taskDefKey") + private String taskDefKey; + + @ApiModelProperty(value = "优惠包类别key") + private String discountTypeKey; + + @ApiModelProperty(value = "不确定是否需要前端传：还是有分支网关的时候传？？") + private Map formVariables; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/GetNodeVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/GetNodeVo.java new file mode 100644 index 0000000000..a00e87cdeb --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/GetNodeVo.java @@ -0,0 +1,25 @@ +package com.yxt.anrui.base.api.basediscountpackage.flow; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * @Author dimengzhe + * @Date 2022/6/28 11:09 + * @Description + */ +@Data +public class GetNodeVo implements Vo { + private static final long serialVersionUID = 8802774014747063504L; + @ApiModelProperty(value = "节点名称") + private String name; + @ApiModelProperty(value = "节点id") + private String id; + @ApiModelProperty(value = "审批组") + private List candidateGroups; + @ApiModelProperty(value = "是否是最后环节") + private String endTask; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/SubmitBaseDiscountpackageDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/SubmitBaseDiscountpackageDto.java new file mode 100644 index 0000000000..0f454cd779 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackage/flow/SubmitBaseDiscountpackageDto.java @@ -0,0 +1,22 @@ +package com.yxt.anrui.base.api.basediscountpackage.flow; + +import com.yxt.anrui.base.api.basediscountpackage.BaseDiscountpackageDto; +import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseDto; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * @Author dimengzhe + * @Date 2022/6/27 13:38 + * @Description + */ +@Data +public class SubmitBaseDiscountpackageDto extends BaseDiscountpackageDto { + private static final long serialVersionUID = 378585162071125756L; + @ApiModelProperty("意见") + private String comment; + @ApiModelProperty("流程实例id") + private String instanceId; + @ApiModelProperty("任务id") + private String taskId; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVeh.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVeh.java new file mode 100644 index 0000000000..6d75e4a93b --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVeh.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basediscountpackageveh; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVeh.java
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVeh
+ * Description: 销售政策车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售政策车辆表", description = "销售政策车辆表") +@TableName("base_discountpackage_veh") +public class BaseDiscountpackageVeh extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private BigDecimal manufactorSettlementPrice; // 厂家结算价 + @ApiModelProperty("厂家入库日期") + private String priceDate; // 厂家入库日期 + @ApiModelProperty("买断状态key") + private String settlementStatus; // 买断状态key + @ApiModelProperty("买断状态value") + private String settlementStatusValue; // 买断状态value + @ApiModelProperty("销售指导价(贷款)") + private BigDecimal guidedDKPrice; // 销售指导价(贷款) + @ApiModelProperty("销售指导价(全款)") + private BigDecimal guidedQKPrice; // 销售指导价(全款) + @ApiModelProperty("销售政策sid") + private String mainSid; // 销售政策sid +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehDetailsVo.java new file mode 100644 index 0000000000..aa2273fd87 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehDetailsVo.java @@ -0,0 +1,83 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basediscountpackageveh; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVehVo.java
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo
+ * Description: 销售政策车辆表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售政策车辆表 视图数据详情", description = "销售政策车辆表 视图数据详情") +public class BaseDiscountpackageVehDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String manufactorSettlementPrice; // 厂家结算价 + @ApiModelProperty("厂家入库日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date priceDate; // 厂家入库日期 + @ApiModelProperty("买断状态key") + private String settlementStatus; // 买断状态key + @ApiModelProperty("买断状态value") + private String settlementStatusValue; // 买断状态value + @ApiModelProperty("销售指导价(贷款)") + private String guidedDKPrice; // 销售指导价(贷款) + @ApiModelProperty("销售指导价(全款)") + private String guidedQKPrice; // 销售指导价(全款) + @ApiModelProperty("销售政策sid") + private String mainSid; // 销售政策sid + @ApiModelProperty(value = "厂家库龄") + private Long libraryAge; +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehDto.java new file mode 100644 index 0000000000..8ea129cffc --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehDto.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basediscountpackageveh; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVehDto.java
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto
+ * Description: 销售政策车辆表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售政策车辆表 数据传输对象", description = "销售政策车辆表 数据传输对象") +public class BaseDiscountpackageVehDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private BigDecimal manufactorSettlementPrice; // 厂家结算价 + @ApiModelProperty("厂家入库日期") + private String priceDate; // 厂家入库日期 + @ApiModelProperty("买断状态key") + private String settlementStatus; // 买断状态key + @ApiModelProperty("买断状态value") + private String settlementStatusValue; // 买断状态value + @ApiModelProperty("销售指导价(贷款)") + private BigDecimal guidedDKPrice; // 销售指导价(贷款) + @ApiModelProperty("销售指导价(全款)") + private BigDecimal guidedQKPrice; // 销售指导价(全款) + @ApiModelProperty("销售政策sid") + private String mainSid; // 销售政策sid +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehFeign.java new file mode 100644 index 0000000000..d795c35615 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basediscountpackageveh; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVehFeign.java
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehFeign
+ * Description: 销售政策车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "销售政策车辆表") +@FeignClient( + contextId = "anrui-base-BaseDiscountpackageVeh", + name = "anrui-base", + path = "v1/basediscountpackageveh", + fallback = BaseDiscountpackageVehFeignFallback.class) +public interface BaseDiscountpackageVehFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody BaseDiscountpackageVehDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehFeignFallback.java new file mode 100644 index 0000000000..e78b6d7b27 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basediscountpackageveh; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVehFeignFallback.java
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehFeignFallback
+ * Description: 销售政策车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BaseDiscountpackageVehFeignFallback implements BaseDiscountpackageVehFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/basediscountpackageveh/listPage无法访问"); + } + + @Override + public ResultBean save(BaseDiscountpackageVehDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-base/basediscountpackageveh/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-base/basediscountpackageveh/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/basediscountpackageveh/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehQuery.java new file mode 100644 index 0000000000..956a8cd19a --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehQuery.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basediscountpackageveh; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVehQuery.java
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehQuery
+ * Description: 销售政策车辆表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售政策车辆表 查询条件", description = "销售政策车辆表 查询条件") +public class BaseDiscountpackageVehQuery implements Query { + + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String manufactorSettlementPrice; // 厂家结算价 + @ApiModelProperty("厂家入库日期") + private String priceDate; // 厂家入库日期 + @ApiModelProperty("买断状态key") + private String settlementStatus; // 买断状态key + @ApiModelProperty("买断状态value") + private String settlementStatusValue; // 买断状态value + @ApiModelProperty("销售指导价(贷款)") + private String guidedDKPrice; // 销售指导价(贷款) + @ApiModelProperty("销售指导价(全款)") + private String guidedQKPrice; // 销售指导价(全款) + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehVo.java new file mode 100644 index 0000000000..3722feb735 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basediscountpackageveh/BaseDiscountpackageVehVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basediscountpackageveh; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVehVo.java
+ * Class: com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo
+ * Description: 销售政策车辆表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "销售政策车辆表 视图数据对象", description = "销售政策车辆表 视图数据对象") +public class BaseDiscountpackageVehVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty("车架号") + private String vinNo; // 车架号 + @ApiModelProperty("厂家结算价") + private String manufactorSettlementPrice; // 厂家结算价 + @ApiModelProperty("厂家入库日期") + private String priceDate; // 厂家入库日期 + @ApiModelProperty("买断状态key") + private String settlementStatus; // 买断状态key + @ApiModelProperty("买断状态value") + private String settlementStatusValue; // 买断状态value + @ApiModelProperty("销售指导价(贷款)") + private String guidedDKPrice; // 销售指导价(贷款) + @ApiModelProperty("销售指导价(全款)") + private String guidedQKPrice; // 销售指导价(全款) + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java index 567eb05ffb..383ab4681d 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java @@ -83,7 +83,7 @@ public interface BaseInternalPurchaseFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); - /*****************************车型调价流程****************************************************/ + /*****************************车型调车流程****************************************************/ @ApiOperation("提交调车审批流程") @PostMapping("/submitBaseInternalPurchase") diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimit.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimit.java new file mode 100644 index 0000000000..ad41c0d0ec --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimit.java @@ -0,0 +1,62 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.baseroleletpricepowimit; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.yxt.common.core.domain.BaseEntity; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimit.java
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimit
+ * Description: 角色让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "角色让价权限表", description = "角色让价权限表") +@TableName("base_roleletpricepowimit") +public class BaseRoleletpricepowimit extends BaseEntity { + private static final long serialVersionUID = 1L; + + @ApiModelProperty("角色sid") + private String roleSid; // 角色sid + @ApiModelProperty("角色名称") + private String roleName; // 角色名称 + @ApiModelProperty("让价金额") + private String letPrice; // 让价金额 + @ApiModelProperty("品牌让价权限sid") + private String mainSid; // 品牌让价权限sid + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitDetailsVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitDetailsVo.java new file mode 100644 index 0000000000..26a565cc09 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitDetailsVo.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.baseroleletpricepowimit; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimitVo.java
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo
+ * Description: 角色让价权限表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "角色让价权限表 视图数据详情", description = "角色让价权限表 视图数据详情") +public class BaseRoleletpricepowimitDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("角色sid") + private String roleSid; // 角色sid + @ApiModelProperty("角色名称") + private String roleName; // 角色名称 + @ApiModelProperty("让价金额") + private String letPrice; // 让价金额 + @ApiModelProperty("品牌让价权限sid") + private String mainSid; // 品牌让价权限sid + +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitDto.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitDto.java new file mode 100644 index 0000000000..ecbec2dc7d --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitDto.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.baseroleletpricepowimit; + + +import com.yxt.common.core.dto.Dto; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimitDto.java
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto
+ * Description: 角色让价权限表 数据传输对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "角色让价权限表 数据传输对象", description = "角色让价权限表 数据传输对象") +public class BaseRoleletpricepowimitDto implements Dto { + + private String sid; // sid + + @ApiModelProperty("角色sid") + private String roleSid; // 角色sid + @ApiModelProperty("角色名称") + private String roleName; // 角色名称 + @ApiModelProperty("让价金额") + private String letPrice; // 让价金额 + @ApiModelProperty("品牌让价权限sid") + private String mainSid; // 品牌让价权限sid + +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitFeign.java new file mode 100644 index 0000000000..bf851a7ced --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitFeign.java @@ -0,0 +1,78 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.baseroleletpricepowimit; + +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimitFeign.java
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitFeign
+ * Description: 角色让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "角色让价权限表") +@FeignClient( + contextId = "anrui-base-BaseRoleletpricepowimit", + name = "anrui-base", + path = "v1/baseroleletpricepowimit", + fallback = BaseRoleletpricepowimitFeignFallback.class) +public interface BaseRoleletpricepowimitFeign { + + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + @ResponseBody + public ResultBean> listPage(@RequestBody PagerQuery pq); + + @ApiOperation("新增或修改") + @PostMapping("/save") + @ResponseBody + public ResultBean save(@RequestBody BaseRoleletpricepowimitDto dto); + + @ApiOperation("根据sid删除记录") + @DeleteMapping("/delBySids") + @ResponseBody + public ResultBean delBySids(@RequestBody String[] sids); + + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + @ResponseBody + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitFeignFallback.java new file mode 100644 index 0000000000..05e9909470 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitFeignFallback.java @@ -0,0 +1,72 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.baseroleletpricepowimit; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import org.springframework.stereotype.Component; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimitFeignFallback.java
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitFeignFallback
+ * Description: 角色让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Component +public class BaseRoleletpricepowimitFeignFallback implements BaseRoleletpricepowimitFeign { + + @Override + public ResultBean> listPage(PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/baseroleletpricepowimit/listPage无法访问"); + } + + @Override + public ResultBean save(BaseRoleletpricepowimitDto dto){ + return ResultBean.fireFail().setMsg("接口anrui-base/baseroleletpricepowimit/save无法访问"); + } + + @Override + public ResultBean delBySids( String[] sids){ + return ResultBean.fireFail().setMsg("接口anrui-base/baseroleletpricepowimit/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid){ + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-base/baseroleletpricepowimit/fetchDetailsBySid无法访问"); + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitQuery.java new file mode 100644 index 0000000000..479bd70e14 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitQuery.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.baseroleletpricepowimit; + + +import com.yxt.common.core.query.Query; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimitQuery.java
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitQuery
+ * Description: 角色让价权限表 查询条件.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "角色让价权限表 查询条件", description = "角色让价权限表 查询条件") +public class BaseRoleletpricepowimitQuery implements Query { + + @ApiModelProperty("角色sid") + private String roleSid; // 角色sid + @ApiModelProperty("角色名称") + private String roleName; // 角色名称 + @ApiModelProperty("让价金额") + private String letPrice; // 让价金额 + @ApiModelProperty("品牌让价权限sid") + private String mainSid; // 品牌让价权限sid + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitVo.java new file mode 100644 index 0000000000..ec63e27e0e --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseroleletpricepowimit/BaseRoleletpricepowimitVo.java @@ -0,0 +1,63 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.baseroleletpricepowimit; + + +import com.yxt.common.core.vo.Vo; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimitVo.java
+ * Class: com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo
+ * Description: 角色让价权限表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "角色让价权限表 视图数据对象", description = "角色让价权限表 视图数据对象") +public class BaseRoleletpricepowimitVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("角色sid") + private String roleSid; // 角色sid + @ApiModelProperty("角色名称") + private String roleName; // 角色名称 + @ApiModelProperty("让价金额") + private String letPrice; // 让价金额 + @ApiModelProperty("品牌让价权限sid") + private String mainSid; // 品牌让价权限sid + +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java new file mode 100644 index 0000000000..5538929703 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehQuery.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basevehicle; + + +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + +@Data +@ApiModel(value = "销售政策选择车辆 查询条件", description = "销售政策选择车辆 查询条件") +public class BaseDiscountpackageGetVehQuery implements Query { + + @ApiModelProperty(value = "品牌") + private String brandSid; + @ApiModelProperty(value = "功能") + private String vehicleType; + @ApiModelProperty(value = "系列") + private String productLine; + @ApiModelProperty(value = "变速箱") + private String gearboxType; + @ApiModelProperty(value = "驱动") + private String driveForm; + @ApiModelProperty(value = "排放标准") + private String emissionStandard; + @ApiModelProperty(value = "马力") + private String power; + @ApiModelProperty(value = "燃料") + private String fuelType; + @ApiModelProperty(value = "版本") + private String vehicleVersion; + @ApiModelProperty(value = "车型") + private String vehicleAlias; + @ApiModelProperty(value = "快捷检索车型") + private String modelName; + + @ApiModelProperty("车辆sid") + private List vehSids; // 车辆sid + + @ApiModelProperty(value = "orgSid") + private String orgSid; +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehVo.java new file mode 100644 index 0000000000..37f3b7fbe0 --- /dev/null +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseDiscountpackageGetVehVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.api.basevehicle; + + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.yxt.common.core.query.Query; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; +import java.util.Date; + +@Data +@ApiModel(value = "销售政策选择车辆 视图数据对象", description = "销售政策选择车辆 视图数据对象") +public class BaseDiscountpackageGetVehVo implements Query { + + @ApiModelProperty("车辆sid") + private String vehSid; // 车辆sid + @ApiModelProperty(value = "存放地点") + private String locationName; + @ApiModelProperty("品牌") + private String brandName; + @ApiModelProperty("车架号") + private String vinNo; + @ApiModelProperty("车型sid") + private String vehModelSid; // 车型sid + @ApiModelProperty("车型名称") + private String vehModelName; // 车型名称 + @ApiModelProperty("入库日期") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + private Date priceDate; + @ApiModelProperty(value = "厂家库龄") + private Long libraryAge; + @ApiModelProperty("买断状态") + private String settlementStatus; + @ApiModelProperty("买断状态value") + private String settlementStatusValue; + @ApiModelProperty("厂家结算价") + private String manufactorSettlementPrice; // 厂家结算价 + @ApiModelProperty("销售指导价(贷款)") + private BigDecimal guidedDKPrice; // 销售指导价(贷款) + @ApiModelProperty("销售指导价(全款)") + private BigDecimal guidedQKPrice; // 销售指导价(全款) +} diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java index 4ef43d15de..62a7495f89 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeign.java @@ -317,6 +317,11 @@ public interface BaseVehicleFeign { @PostMapping("/selectVo") ResultBean> selectVo(@RequestBody PagerQuery pcBaseVehicleOrderQuery); + @ApiOperation("销售政策选择车辆列表") + @PostMapping("/baseDisCountPackageGetVeh") + @ResponseBody + public ResultBean> baseDisCountPackageGetVeh(@RequestBody PagerQuery pq); + @ApiOperation("销售订单-根据车型和配置sid查询现车的数量") @GetMapping("/selectCount") ResultBean selectCount(@SpringQueryMap PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery); diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java index 4cf726c004..8c669ecbe0 100644 --- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java +++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicle/BaseVehicleFeignFallback.java @@ -211,6 +211,11 @@ public class BaseVehicleFeignFallback implements BaseVehicleFeign { return null; } + @Override + public ResultBean> baseDisCountPackageGetVeh(PagerQuery pq) { + return null; + } + @Override public ResultBean selectCount(PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery) { return null; diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.java new file mode 100644 index 0000000000..c6f050273d --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.java @@ -0,0 +1,68 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.basebrandletpricepowimit; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimit; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimitMapper.java
+ * Class: com.yxt.anrui.base.biz.basebrandletpricepowimit.BaseBrandletpricepowimitMapper
+ * Description: 品牌让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BaseBrandletpricepowimitMapper extends BaseMapper { + + //@Update("update base_brandletpricepowimit set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_brandletpricepowimit") + List selectListVo(); + + BaseBrandletpricepowimitVo fetchByBrandSidAndUseOrgSid(@Param("brandSid") String brandSid,@Param("useOrgSid") String useOrgSid); + +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.xml new file mode 100644 index 0000000000..1d1ee661fa --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitRest.java new file mode 100644 index 0000000000..99d8ef05d5 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitRest.java @@ -0,0 +1,99 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.basebrandletpricepowimit; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.apache.ibatis.annotations.Delete; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimit; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitQuery; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDetailsVo; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDto; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimitFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.basebrandletpricepowimit.BaseBrandletpricepowimitRest
+ * Description: 品牌让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "品牌让价权限表") +@RestController("com.yxt.anrui.base.biz.basebrandletpricepowimit.BaseBrandletpricepowimitRest") +@RequestMapping("v1/basebrandletpricepowimit") +public class BaseBrandletpricepowimitRest implements BaseBrandletpricepowimitFeign { + + @Autowired + private BaseBrandletpricepowimitService baseBrandletpricepowimitService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = baseBrandletpricepowimitService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BaseBrandletpricepowimitDto dto){ + return baseBrandletpricepowimitService.saveOrUpdateDto(dto); + } + + @Override + @ApiOperation("根据sid批量删除") + @DeleteMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseBrandletpricepowimitService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + BaseBrandletpricepowimitDetailsVo vo = baseBrandletpricepowimitService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java new file mode 100644 index 0000000000..001d643b45 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basebrandletpricepowimit/BaseBrandletpricepowimitService.java @@ -0,0 +1,186 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.basebrandletpricepowimit; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimit; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto; +import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand; +import com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitService; +import com.yxt.anrui.base.biz.basevehiclebrand.BaseVehicleBrandService; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimit; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitQuery; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitVo; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDetailsVo; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitDto; +import com.yxt.anrui.base.api.basebrandletpricepowimit.BaseBrandletpricepowimitFeign; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseBrandletpricepowimitService.java
+ * Class: com.yxt.anrui.base.biz.basebrandletpricepowimit.BaseBrandletpricepowimitService
+ * Description: 品牌让价权限表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BaseBrandletpricepowimitService extends MybatisBaseService { + + @Autowired + private BaseRoleletpricepowimitService baseRoleletpricepowimitService; + @Autowired + private SysOrganizationFeign organizationFeign; + @Autowired + private BaseVehicleBrandService baseVehicleBrandService; + + private QueryWrapper createQueryWrapper(BaseBrandletpricepowimitQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BaseBrandletpricepowimitQuery query = pq.getParams(); + String orgSidPath = query.getOrgSidPath(); + String sybOrgSid = orgSidPath.substring(37, 73); + List sysOrganizationVos = organizationFeign.selectOrgByPSid(sybOrgSid).getData(); + if (!sysOrganizationVos.isEmpty()) { + for (SysOrganizationVo sysOrganizationVo : sysOrganizationVos) { + List baseVehicleBrands = baseVehicleBrandService.selectByUseOrgSid(sysOrganizationVo.getSid()); + if (!baseVehicleBrands.isEmpty()) { + for (BaseVehicleBrand baseVehicleBrand : baseVehicleBrands) { + BaseBrandletpricepowimitVo baseBrandletpricepowimitVo = baseMapper.fetchByBrandSidAndUseOrgSid(baseVehicleBrand.getSid(), sysOrganizationVo.getSid()); + if (baseBrandletpricepowimitVo == null) { + BaseBrandletpricepowimit baseBrandletpricepowimit = new BaseBrandletpricepowimit(); + baseBrandletpricepowimit.setBrandSid(baseVehicleBrand.getSid()); + baseBrandletpricepowimit.setBrandName(baseVehicleBrand.getBrandName()); + baseBrandletpricepowimit.setUseOrgSid(sysOrganizationVo.getSid()); + baseBrandletpricepowimit.setUseOrgName(sysOrganizationVo.getName()); + baseBrandletpricepowimit.setCreateOrgSid(sybOrgSid); + save(baseBrandletpricepowimit); + } + } + } + } + } + QueryWrapper qw = new QueryWrapper<>(); + if (StringUtils.isNotBlank(query.getBrandSid())) { + qw.eq("brandSid", query.getBrandSid()); + } + if (StringUtils.isNotBlank(query.getUseOrgSid())) { + qw.eq("useOrgSid", query.getUseOrgSid()); + } + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + for (BaseBrandletpricepowimitVo record : pagging.getRecords()) { + String sid = record.getSid(); + List baseRoleletpricepowimitDetailsVos = baseRoleletpricepowimitService.fetchByMainSid(sid); + if (!baseRoleletpricepowimitDetailsVos.isEmpty()) { + StringBuilder roleLetPrice = new StringBuilder(); + for (BaseRoleletpricepowimitDetailsVo baseRoleletpricepowimitDetailsVo : baseRoleletpricepowimitDetailsVos) { + String roleName = baseRoleletpricepowimitDetailsVo.getRoleName(); + String letPrice = baseRoleletpricepowimitDetailsVo.getLetPrice(); + roleLetPrice.append(roleName).append("(").append(letPrice).append(")").append("、"); + } + record.setRoleLetPrice(roleLetPrice.substring(0,roleLetPrice.lastIndexOf("、"))); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public ResultBean saveOrUpdateDto(BaseBrandletpricepowimitDto dto) { + ResultBean rb = ResultBean.fireFail(); + String dtoSid = dto.getSid(); + List baseRoleletpricepowimits = dto.getBaseRoleletpricepowimits(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return rb.success(); + } + this.updateByDto(dto); + BaseBrandletpricepowimit baseBrandletpricepowimit = fetchBySid(dtoSid); + if (baseBrandletpricepowimit == null) { + return rb.setMsg("该品牌让价权限不存在"); + } + baseRoleletpricepowimitService.deleteByMainSid(dtoSid); + for (BaseRoleletpricepowimitDto baseRoleletpricepowimitDto : baseRoleletpricepowimits) { + BaseRoleletpricepowimit baseRoleletpricepowimit = new BaseRoleletpricepowimit(); + baseRoleletpricepowimit.setRoleSid(baseRoleletpricepowimitDto.getRoleSid()); + baseRoleletpricepowimit.setRoleName(baseRoleletpricepowimitDto.getRoleName()); + baseRoleletpricepowimit.setLetPrice(baseRoleletpricepowimitDto.getLetPrice()); + baseRoleletpricepowimit.setMainSid(dtoSid); + baseRoleletpricepowimitService.save(baseRoleletpricepowimit); + } + return rb.success().setMsg("修改成功"); + } + + public void insertByDto(BaseBrandletpricepowimitDto dto) { + BaseBrandletpricepowimit entity = new BaseBrandletpricepowimit(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BaseBrandletpricepowimitDto dto) { + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + BaseBrandletpricepowimit entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BaseBrandletpricepowimitDetailsVo fetchDetailsVoBySid(String sid) { + BaseBrandletpricepowimit entity = fetchBySid(sid); + BaseBrandletpricepowimitDetailsVo vo = new BaseBrandletpricepowimitDetailsVo(); + BeanUtil.copyProperties(entity, vo); + List baseRoleletpricepowimitDetailsVos = baseRoleletpricepowimitService.fetchByMainSid(sid); + vo.setBaseRoleletpricepowimits(baseRoleletpricepowimitDetailsVos); + return vo; + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.java index d26355112e..47513ff48d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.java @@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import java.util.List; +import java.util.Map; /** * Project: base_discountpackage(优惠包)
@@ -61,4 +62,6 @@ public interface BaseDiscountpackageMapper extends BaseMapper getAppPackage(@Param(Constants.WRAPPER) QueryWrapper qw); + + int updateFlowFiled(Map beanToMap); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml index 461a772574..5638ce33a3 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageMapper.xml @@ -44,4 +44,19 @@ ${ew.sqlSegment} + + + UPDATE base_discountpackage + SET nodeState=#{nodeState}, nodeSid=#{taskDefKey} + + , procDefId=#{procDefId} + + + , procInstId=#{procInsId} + + + , taskId=#{taskId} + + WHERE sid=#{sid} + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java index 22312dfb65..849797d9c9 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageRest.java @@ -1,9 +1,13 @@ package com.yxt.anrui.base.biz.basediscountpackage; +import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basediscountpackage.*; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; +import com.yxt.anrui.base.api.basediscountpackage.flow.*; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.result.ResultBean; @@ -103,12 +107,6 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign { public ResultBean fetchSid(String sid) { ResultBean rb = ResultBean.fireFail(); BaseDiscountpackageVo vo = baseDiscountpackageService.selectBySid(sid); - String discountMoney = vo.getDiscountMoney(); - String projectCost = vo.getProjectCost(); - discountMoney = discountMoney.substring(0,discountMoney.indexOf(".")); - projectCost = projectCost.substring(0,projectCost.indexOf(".")); - vo.setDiscountMoney(discountMoney); - vo.setProjectCost(projectCost); return rb.success().setData(vo); } @@ -142,4 +140,42 @@ public class BaseDiscountpackageRest implements BaseDiscountpackageFeign { return baseDiscountpackageService.getAppPackage(appBaseDiscountpackageQuery); } + @Override + public ResultBean submitBaseDiscountpackage(SubmitBaseDiscountpackageDto dto) { + return baseDiscountpackageService.submitBaseDiscountpackage(dto); + } + + @Override + public ResultBean complete(BaseDiscountpackageCompleteDto bvd) { + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(bvd, bv); + bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId()); + return baseDiscountpackageService.complete(bv); + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return baseDiscountpackageService.getNextNodesForSubmit(query); + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return baseDiscountpackageService.getPreviousNodesForReject(query); + } + + @Override + public ResultBean taskReject(BaseDiscountpackageTaskQuery query) { + return baseDiscountpackageService.taskReject(query); + } + + @Override + public ResultBean revokeProcess(BaseDiscountpackageTaskQuery query) { + return baseDiscountpackageService.revokeProcess(query); + } + + @Override + public ResultBean breakProcess(BaseDiscountpackageTaskQuery query) { + return baseDiscountpackageService.breakProcess(query); + } + } diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java index 14c0e6351b..6ae2db468d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackage/BaseDiscountpackageService.java @@ -1,16 +1,36 @@ package com.yxt.anrui.base.biz.basediscountpackage; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.base.api.basediscountpackage.*; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageQuery; import com.yxt.anrui.base.api.basediscountpackage.app.AppBaseDiscountpackageVo; +import com.yxt.anrui.base.api.basediscountpackage.flow.BaseDiscountpackageTaskQuery; +import com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeQuery; +import com.yxt.anrui.base.api.basediscountpackage.flow.GetNodeVo; +import com.yxt.anrui.base.api.basediscountpackage.flow.SubmitBaseDiscountpackageDto; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVeh; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto; +import com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehService; +import com.yxt.anrui.flowable.api.flow.FlowableFeign; +import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign; +import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkDto; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkFeign; import com.yxt.anrui.flowable.api.sysformlink.SysFormLinkTypeEnum; +import com.yxt.anrui.flowable.api.utils.ProcDefEnum; +import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg; import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; +import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; @@ -22,6 +42,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.*; +import java.util.stream.Collectors; /** * Project: base_discountpackage(优惠包)
@@ -48,6 +69,15 @@ public class BaseDiscountpackageService extends MybatisBaseService page = PagerUtil.queryToPage(pq); QueryWrapper qw = buildQueryWrapper(pq.getParams()); IPage busOrderDiscountPageListVoIPage = baseMapper.listPage(page, qw); - List records = busOrderDiscountPageListVoIPage.getRecords(); - for (BaseDiscountpackagePageListVo record : records) { - String discountMoney = record.getDiscountMoney(); - String projectCost = record.getProjectCost(); - discountMoney = discountMoney.substring(0, discountMoney.indexOf(".")); - projectCost = projectCost.substring(0, projectCost.indexOf(".")); - record.setDiscountMoney(discountMoney); - record.setProjectCost(projectCost); - } return busOrderDiscountPageListVoIPage; } @@ -116,7 +137,17 @@ public class BaseDiscountpackageService extends MybatisBaseService baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs(); + for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) { + BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh(); + String sid = baseDiscountpackageVeh.getSid(); + BeanUtil.copyProperties(baseDiscountpackageVehDto,baseDiscountpackageVeh); + baseDiscountpackageVeh.setSid(sid); + baseDiscountpackageVeh.setMainSid(entity.getSid()); + baseDiscountpackageVehService.save(baseDiscountpackageVeh); + } return rb.success().setData(entity.getSid()); } @@ -131,6 +162,16 @@ public class BaseDiscountpackageService extends MybatisBaseService baseDiscountpackageVehs = dto.getBaseDiscountpackageVehs(); + for (BaseDiscountpackageVehDto baseDiscountpackageVehDto : baseDiscountpackageVehs) { + BaseDiscountpackageVeh baseDiscountpackageVeh = new BaseDiscountpackageVeh(); + String sid1 = baseDiscountpackageVeh.getSid(); + BeanUtil.copyProperties(baseDiscountpackageVehDto,baseDiscountpackageVeh); + baseDiscountpackageVeh.setSid(sid1); + baseDiscountpackageVeh.setMainSid(sid); + baseDiscountpackageVehService.save(baseDiscountpackageVeh); + } return rb.success(); } @@ -175,6 +216,18 @@ public class BaseDiscountpackageService extends MybatisBaseService baseDiscountpackageVehDetailsVos = baseDiscountpackageVehService.fetchByMainSid(sid); + for (BaseDiscountpackageVehDetailsVo baseDiscountpackageVehDetailsVo : baseDiscountpackageVehDetailsVos) { + if (baseDiscountpackageVehDetailsVo.getPriceDate() != null) { + Date priceDate = baseDiscountpackageVehDetailsVo.getPriceDate(); + String today = DateUtil.today(); + DateTime currentDate = DateUtil.parse(today); + int i = priceDate.compareTo(currentDate); + long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY); + baseDiscountpackageVehDetailsVo.setLibraryAge(betweenDay * i * -1); + } + } + vo.setBaseDiscountpackageVehs(baseDiscountpackageVehDetailsVos); return vo; } @@ -186,7 +239,7 @@ public class BaseDiscountpackageService extends MybatisBaseService orgByStaffSid = sysStaffOrgFeign.getOrgByStaffSid(dto.getStaffSid()); + if (!orgByStaffSid.getSuccess()) { + return rb.setMsg(orgByStaffSid.getMsg()); + } + //用户的组织全路径 + String orgSidPath = orgByStaffSid.getData().getOrgSidPath(); + BaseDiscountpackage baseDiscountpackage = fetchBySid(dto.getSid()); + int r = submitBusinessData(dto, baseDiscountpackage); + if (r == 3) { + return rb.setMsg("该申请不存在"); + } + if (r == 0) { + return rb.setMsg("操作失败!提交的数据不一致"); + } + String businessSid = ""; + //新增修改保存 + if (StringUtils.isBlank(dto.getSid())) { + ResultBean resultBean = saveOrUpdateDto(dto); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + businessSid = resultBean.getData(); + } else { + ResultBean resultBean = updateByDiscountSid(dto, dto.getSid()); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + businessSid = dto.getSid(); + } + //创建BusinessVariables实体对象 + BusinessVariables bv = new BusinessVariables(); + //流程中的参数赋值 + Map variables = BeanUtil.beanToMap(dto); + //若有网关，则赋值网关中判断的字段。 + variables.put("businessSid", businessSid); + //=====================添加app所需参数 + Map appMap = new HashMap<>(); + appMap.put("sid", businessSid); + variables.put("app", appMap); + //用户的部门全路径sid + bv.setOrgSidPath(orgSidPath); + //业务sid + bv.setBusinessSid(businessSid); + //用户sid + bv.setUserSid(dto.getCreateBySid()); + bv.setFormVariables(variables); + //流程定义id + bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId()); + if (r == 1) { + ResultBean voResultBean = flowableFeign.startProcess(bv); + UpdateFlowFieldVo ufVo = voResultBean.getData(); + updateFlowFiled(BeanUtil.beanToMap(ufVo)); + return voResultBean; + } + if (r == 2) { + // ToDo:驳回到发起人后再次提交 + if (StringUtils.isBlank(dto.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + bv.setTaskId(baseDiscountpackage.getTaskId()); + bv.setTaskDefKey(baseDiscountpackage.getNodeSid()); + bv.setComment(StringUtils.isNotBlank(dto.getComment()) ? dto.getComment() : "重新提交"); + bv.setInstanceId(dto.getInstanceId()); + return complete(bv); + } + return rb; + } + + /** + * 判断提交的流程是否被允许 + * + * @param dto + * @return + */ + private synchronized int submitBusinessData(SubmitBaseDiscountpackageDto dto, BaseDiscountpackage baseDiscountpackage) { + int r = 0; + if (StringUtils.isBlank(dto.getSid())) { + r = 1; + } else { + if (baseDiscountpackage != null) { + String businessTaskId = baseDiscountpackage.getTaskId(); + if (StringUtils.isBlank(businessTaskId) && StringUtils.isBlank(dto.getTaskId())) { + //新提交 + r = 1; + } else if (StringUtils.isNotBlank(businessTaskId) && businessTaskId.equals(dto.getTaskId())) { + //二次提交//只有数据一致的时候才能进行下一步 + r = 2; + } + } else { + r = 3; + } + + } + return r; + } + + private int updateFlowFiled(Map beanToMap) { + return baseMapper.updateFlowFiled(beanToMap); + } + + public ResultBean complete(BusinessVariables bv) { + ResultBean rb = ResultBean.fireFail(); + BaseDiscountpackage baseDiscountpackage = fetchBySid(bv.getBusinessSid()); + Boolean i = false; + Map map = new HashMap<>(); + Map formVariables = bv.getFormVariables(); + if ("0001".equals(baseDiscountpackage.getDiscountTypeKey())){ + i = true; + } + if (formVariables == null) { + map.put("isAdj", i); + bv.setFormVariables(map); + } else { + formVariables.put("isAdj", i); + } + if (bv.getTaskId().equals(baseDiscountpackage.getTaskId())) { + ResultBean 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> getNextNodesForSubmit(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId()); + Boolean i = false; + Map map = new HashMap<>(); + Map formVariables = bv.getFormVariables(); + if ("0001".equals(query.getDiscountTypeKey())){ + i = true; + } + if (formVariables == null) { + map.put("isAdj", i); + bv.setFormVariables(map); + } else { + formVariables.put("isAdj", i); + } + ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); +// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } + + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + ResultBean> rb = ResultBean.fireFail(); + BusinessVariables bv = new BusinessVariables(); + BeanUtil.copyProperties(query, bv); + bv.setModelId(ProcDefEnum.SALESPOLICY.getProDefId()); + ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); + //判断数组是否为空，若为空则赋值，若不为空，则遍历循环将map中的数据赋值给getNodeVo + List voList = Optional.ofNullable(resultBean.getData()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); +// List voList = resultBean.getData().stream().map(m -> JSON.parseObject(JSON.toJSONString(m), GetNodeVo.class)).collect(Collectors.toList()); + return rb.success().setData(voList); + } + + public ResultBean taskReject(BaseDiscountpackageTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + BaseDiscountpackage baseDiscountpackage = fetchBySid(query.getBusinessSid()); + if (baseDiscountpackage == null) { + return rb.setMsg("该申请不存在"); + } + String businessTaskId = baseDiscountpackage.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + if (StringUtils.isBlank(query.getComment())) { + return rb.setMsg("参数错误：comment"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + //更新业务中的流程相关的参数 + updateFlowFiled(map); + return rb.success(); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } + + public ResultBean revokeProcess(BaseDiscountpackageTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + //根据业务sid查询排产申请 + BaseDiscountpackage baseDiscountpackage = fetchBySid(query.getBusinessSid()); + String businessTaskId = baseDiscountpackage.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.revokeProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + updateFlowFiled(BeanUtil.beanToMap(resultBean.getData())); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败，提交的数据不一致!"); + } + + public ResultBean breakProcess(BaseDiscountpackageTaskQuery query) { + ResultBean rb = ResultBean.fireFail(); + if (StringUtils.isBlank(query.getInstanceId())) { + return rb.setMsg("参数错误：instanceId"); + } + if (StringUtils.isBlank(query.getUserSid())) { + return rb.setMsg("参数错误：userSid"); + } + BaseDiscountpackage baseDiscountpackage = fetchBySid(query.getBusinessSid()); + String businessTaskId = baseDiscountpackage.getTaskId(); + if (StringUtils.isNotBlank(businessTaskId)) { + if (businessTaskId.equals(query.getTaskId())) { + FlowTaskVo flowTaskVo = new FlowTaskVo(); + BeanUtil.copyProperties(query, flowTaskVo); + ResultBean resultBean = flowableFeign.breakProcess(flowTaskVo); + if (!resultBean.getSuccess()) { + return rb.setMsg(resultBean.getMsg()); + } + Map map = BeanUtil.beanToMap(resultBean.getData()); + updateFlowFiled(map); + return rb.success().setData(resultBean.getData()); + } + } + return rb.setMsg("操作失败!提交的数据不一致!"); + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehMapper.java new file mode 100644 index 0000000000..d8dcfa50ae --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehMapper.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.basediscountpackageveh; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVeh; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo; + +import java.util.List; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVehMapper.java
+ * Class: com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehMapper
+ * Description: 销售政策车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:18
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BaseDiscountpackageVehMapper extends BaseMapper { + + //@Update("update base_discountpackage_veh set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_discountpackage_veh") + List selectListVo(); + + @Delete("delete from base_discountpackage_veh where mainSid = #{sid}") + void deleteByMainSid(String sid); + + @Select("select * from base_discountpackage_veh where mainSid = #{sid}") + List fetchByMainSid(String sid); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehMapper.xml new file mode 100644 index 0000000000..44aa9a080e --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehRest.java new file mode 100644 index 0000000000..53752f316e --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.basediscountpackageveh; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVeh; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehQuery; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehFeign; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVehFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehRest
+ * Description: 销售政策车辆表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "销售政策车辆表") +@RestController("com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehRest") +@RequestMapping("v1/basediscountpackageveh") +public class BaseDiscountpackageVehRest implements BaseDiscountpackageVehFeign { + + @Autowired + private BaseDiscountpackageVehService baseDiscountpackageVehService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = baseDiscountpackageVehService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BaseDiscountpackageVehDto dto){ + ResultBean rb = ResultBean.fireFail(); + baseDiscountpackageVehService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseDiscountpackageVehService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + BaseDiscountpackageVehDetailsVo vo = baseDiscountpackageVehService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehService.java new file mode 100644 index 0000000000..ed2f60d108 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basediscountpackageveh/BaseDiscountpackageVehService.java @@ -0,0 +1,118 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.basediscountpackageveh; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVeh; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehQuery; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehVo; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDetailsVo; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehDto; +import com.yxt.anrui.base.api.basediscountpackageveh.BaseDiscountpackageVehFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-base(销售政策车辆表)
+ * File: BaseDiscountpackageVehService.java
+ * Class: com.yxt.anrui.base.biz.basediscountpackageveh.BaseDiscountpackageVehService
+ * Description: 销售政策车辆表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-08 13:44:17
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BaseDiscountpackageVehService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(BaseDiscountpackageVehQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BaseDiscountpackageVehQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(BaseDiscountpackageVehDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(BaseDiscountpackageVehDto dto){ + BaseDiscountpackageVeh entity = new BaseDiscountpackageVeh(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BaseDiscountpackageVehDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + BaseDiscountpackageVeh entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BaseDiscountpackageVehDetailsVo fetchDetailsVoBySid(String sid){ + BaseDiscountpackageVeh entity = fetchBySid(sid); + BaseDiscountpackageVehDetailsVo vo = new BaseDiscountpackageVehDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public void deleteByMainSid(String sid) { + baseMapper.deleteByMainSid(sid); + } + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitMapper.java new file mode 100644 index 0000000000..46346b69a5 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitMapper.java @@ -0,0 +1,73 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.baseroleletpricepowimit; + +import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo; +import org.apache.ibatis.annotations.Delete; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimit; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimitMapper.java
+ * Class: com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitMapper
+ * Description: 角色让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Mapper +public interface BaseRoleletpricepowimitMapper extends BaseMapper { + + //@Update("update base_roleletpricepowimit set name=#{msg} where id=#{id}") + //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); + + IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); + + List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); + + @Select("select * from base_roleletpricepowimit") + List selectListVo(); + + @Select("select * from base_roleletpricepowimit where mainSid = #{sid}") + List fetchByMainSid(String sid); + + @Delete("delete from base_roleletpricepowimit where mainSid = #{sid}") + void deleteByMainSid(String dtoSid); +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitMapper.xml new file mode 100644 index 0000000000..9e7c1ef052 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitRest.java new file mode 100644 index 0000000000..725b484d34 --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitRest.java @@ -0,0 +1,100 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.baseroleletpricepowimit; + +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import java.util.List; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimit; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitQuery; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitFeign; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimitFeignFallback.java
+ * Class: com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitRest
+ * Description: 角色让价权限表.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Api(tags = "角色让价权限表") +@RestController("com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitRest") +@RequestMapping("v1/baseroleletpricepowimit") +public class BaseRoleletpricepowimitRest implements BaseRoleletpricepowimitFeign { + + @Autowired + private BaseRoleletpricepowimitService baseRoleletpricepowimitService; + + @Override + @ApiOperation("根据条件分页查询数据的列表") + @PostMapping("/listPage") + public ResultBean> listPage(@RequestBody PagerQuery pq){ + ResultBean rb = ResultBean.fireFail(); + PagerVo pv = baseRoleletpricepowimitService.listPageVo(pq); + return rb.success().setData(pv); + } + + @Override + @ApiOperation("新增或修改") + @PostMapping("/save") + public ResultBean save(@RequestBody BaseRoleletpricepowimitDto dto){ + ResultBean rb = ResultBean.fireFail(); + baseRoleletpricepowimitService.saveOrUpdateDto(dto); + return rb.success(); + } + + @Override + @ApiOperation("根据sid批量删除") + @PostMapping("/delBySids") + public ResultBean delBySids(@RequestBody String[] sids){ + ResultBean rb = ResultBean.fireFail(); + baseRoleletpricepowimitService.delBySids(sids); + return rb.success(); + } + + @Override + @ApiOperation("根据SID获取一条记录") + @GetMapping("/fetchDetailsBySid/{sid}") + public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid){ + ResultBean rb = ResultBean.fireFail(); + BaseRoleletpricepowimitDetailsVo vo = baseRoleletpricepowimitService.fetchDetailsVoBySid(sid); + return rb.success().setData(vo); + } +} diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitService.java new file mode 100644 index 0000000000..d301131ced --- /dev/null +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseroleletpricepowimit/BaseRoleletpricepowimitService.java @@ -0,0 +1,118 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.base.biz.baseroleletpricepowimit; + +import cn.hutool.core.bean.BeanUtil; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import org.apache.commons.lang3.StringUtils; +import com.yxt.common.base.service.MybatisBaseService; +import com.yxt.common.base.utils.PagerUtil; +import com.yxt.common.core.query.PagerQuery; +import com.yxt.common.core.result.ResultBean; +import com.yxt.common.core.vo.PagerVo; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimit; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitQuery; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitVo; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDetailsVo; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitDto; +import com.yxt.anrui.base.api.baseroleletpricepowimit.BaseRoleletpricepowimitFeign; + +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * Project: anrui-base(品牌让价权限)
+ * File: BaseRoleletpricepowimitService.java
+ * Class: com.yxt.anrui.base.biz.baseroleletpricepowimit.BaseRoleletpricepowimitService
+ * Description: 角色让价权限表 业务逻辑.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-11-09 10:57:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Service +public class BaseRoleletpricepowimitService extends MybatisBaseService { + private QueryWrapper createQueryWrapper(BaseRoleletpricepowimitQuery query) { + // todo: 这里根据具体业务调整查询条件 + // 多字段Like示例：qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); + QueryWrapper qw = new QueryWrapper<>(); + return qw; + } + + public PagerVo listPageVo(PagerQuery pq) { + BaseRoleletpricepowimitQuery query = pq.getParams(); + QueryWrapper qw = createQueryWrapper(query); + IPage page = PagerUtil.queryToPage(pq); + IPage pagging = baseMapper.selectPageVo(page, qw); + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } + + public void saveOrUpdateDto(BaseRoleletpricepowimitDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + this.insertByDto(dto); + return; + } + this.updateByDto(dto); + } + + public void insertByDto(BaseRoleletpricepowimitDto dto){ + BaseRoleletpricepowimit entity = new BaseRoleletpricepowimit(); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.insert(entity); + } + + public void updateByDto(BaseRoleletpricepowimitDto dto){ + String dtoSid = dto.getSid(); + if (StringUtils.isBlank(dtoSid)) { + return; + } + BaseRoleletpricepowimit entity = fetchBySid(dtoSid); + BeanUtil.copyProperties(dto, entity, "id", "sid"); + baseMapper.updateById(entity); + } + + public BaseRoleletpricepowimitDetailsVo fetchDetailsVoBySid(String sid){ + BaseRoleletpricepowimit entity = fetchBySid(sid); + BaseRoleletpricepowimitDetailsVo vo = new BaseRoleletpricepowimitDetailsVo(); + BeanUtil.copyProperties(entity, vo); + return vo; + } + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } + + public void deleteByMainSid(String dtoSid) { + baseMapper.deleteByMainSid(dtoSid); + } +} \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java index 00d3b7fe08..98e6b246b2 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.java @@ -474,4 +474,6 @@ public interface BaseVehicleMapper extends BaseMapper { void updateConAndCostPrice(@Param("witPinMoney") String witPinMoney,@Param("vinNo") String vinNo,@Param("callInOrgSid") String callInOrgSid); IPage vehicleCrmPageList(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); + + IPage baseDisCountPackageGetVeh(IPage page,@Param(Constants.WRAPPER) QueryWrapper qw); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml index 19592e99ae..e6b661827c 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleMapper.xml @@ -1311,4 +1311,34 @@ LEFT JOIN base_model_config bmc ON bv.modelConfigSid = bmc.`sid` ${ew.customSqlSegment} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java index 5be4aa6e07..d29808fdcc 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleRest.java @@ -825,6 +825,13 @@ public class BaseVehicleRest implements BaseVehicleFeign { return rb.success().setData(pv); } + @Override + public ResultBean> baseDisCountPackageGetVeh(PagerQuery pq) { + ResultBean> rb = ResultBean.fireFail(); + PagerVo pv = baseVehicleService.baseDisCountPackageGetVeh(pq); + return rb.success().setData(pv); + } + @Override public ResultBean selectCount(PcBaseVehicleOrderCountQuery pcBaseVehicleOrderCountQuery) { return baseVehicleService.selectCount(pcBaseVehicleOrderCountQuery); diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java index 74399d7e25..5f7177c47d 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicle/BaseVehicleService.java @@ -1,5 +1,7 @@ package com.yxt.anrui.base.biz.basevehicle; +import cn.hutool.core.date.DateTime; +import cn.hutool.core.date.DateUnit; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -3184,4 +3186,75 @@ public class BaseVehicleService extends MybatisBaseService baseDisCountPackageGetVeh(PagerQuery pq) { + IPage page = PagerUtil.queryToPage(pq); + BaseDiscountpackageGetVehQuery params = pq.getParams(); + QueryWrapper qw = new QueryWrapper<>(); + //品牌 + if (StringUtils.isNotBlank(params.getBrandSid())) { + qw.eq("bvm.carBrand", params.getBrandSid()); + } + //功能 + if (StringUtils.isNotBlank(params.getVehicleType())) { + qw.eq("bvm.vehicleType", params.getVehicleType()); + } + //系列 + if (StringUtils.isNotBlank(params.getProductLine())) { + qw.eq("bvm.productLine", params.getProductLine()); + } + //变速箱 + if (StringUtils.isNotBlank(params.getGearboxType())) { + qw.eq("bvm.gearboxType", params.getGearboxType()); + } + //驱动 + if (StringUtils.isNotBlank(params.getDriveForm())) { + qw.eq("bvm.driveForm", params.getDriveForm()); + } + //排放标准 + if (StringUtils.isNotBlank(params.getEmissionStandard())) { + qw.eq("bvm.emissionStandard", params.getEmissionStandard()); + } + //马力 + if (StringUtils.isNotBlank(params.getPower())) { + qw.eq("bvm.power", params.getPower()); + } + //燃料 + if (StringUtils.isNotBlank(params.getFuelType())) { + qw.eq("bvm.fuelType", params.getFuelType()); + } + //版本 + if (StringUtils.isNotBlank(params.getVehicleVersion())) { + qw.eq("bvm.vehicleVersion", params.getVehicleVersion()); + } + //车型 + if (StringUtils.isNotBlank(params.getVehicleAlias())) { + qw.like("bvm.vehicleAlias", params.getVehicleAlias()); + } + //快捷检索车型 + if (StringUtils.isNotBlank(params.getModelName())) { + qw.like("bvm.modelName", params.getModelName()); + } + qw.eq("bv.isDelete", 0); + qw.eq("bv.createOrgSid", params.getOrgSid()); + qw.like("bvb.useOrg", params.getOrgSid()); + qw.and(wrapper -> wrapper.eq("bv.vehicleState", VehicleState.StockEnum.STOCK.getCode()).or().eq("bv.vehicleState", VehicleState.StockEnum.DR_STOCK.getCode())); + if (params.getVehSids().size() > 0) { + qw.notIn("bv.sid", params.getVehSids()); + } + + IPage pagging = baseMapper.baseDisCountPackageGetVeh(page, qw); + for (BaseDiscountpackageGetVehVo record : pagging.getRecords()) { + //厂家库龄 + if (record.getPriceDate() != null) { + Date priceDate = record.getPriceDate(); + String today = DateUtil.today(); + DateTime currentDate = DateUtil.parse(today); + int i = priceDate.compareTo(currentDate); + long betweenDay = DateUtil.between(priceDate, currentDate, DateUnit.DAY); + record.setLibraryAge(betweenDay * i * -1); + } + } + PagerVo p = PagerUtil.pageToVo(pagging, null); + return p; + } } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java index c9aa35662d..dbdd32de0e 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.java @@ -136,4 +136,6 @@ public interface BaseVehicleBrandMapper extends BaseMapper { @Select("select bvb.manufacturerSid from base_vehicle_brand bvb where bvb.sid = #{carBrandSid}") String selectByManufacturerSid(@Param("carBrandSid") String carBrandSid); + + List selectByUseOrgSid(String sid); } \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml index ac0893a709..e8e53f39de 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandMapper.xml @@ -130,4 +130,10 @@ select bb.* from base_vehicle_model bm left join base_vehicle_brand bb on bm.carBrand = bb.sid where bm.sid = #{modelSid} + + \ No newline at end of file diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java index 4db9cb9010..3a0450cc77 100644 --- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java +++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehiclebrand/BaseVehicleBrandService.java @@ -224,9 +224,9 @@ public class BaseVehicleBrandService extends MybatisBaseService selectAppListByUserSid(VehicleBrandQuery vehicleBrandQuery) { String userSid = vehicleBrandQuery.getUserSid(); String orgPath = vehicleBrandQuery.getOrgPath(); - if(StringUtils.isBlank(orgPath)){ + if (StringUtils.isBlank(orgPath)) { orgPath = sysStaffOrgFeign.getPathSidByUserSid(userSid).getData(); - }else{ + } else { orgPath = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData(); } List list = baseMapper.selectAppListByUserSid(orgPath); @@ -252,4 +252,8 @@ public class BaseVehicleBrandService extends MybatisBaseService selectByUseOrgSid(String sid) { + return baseMapper.selectByUseOrgSid(sid); + } } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index a0ae2bff14..df94dda8a3 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -2073,10 +2073,18 @@ public class BusSalesOrderService extends MybatisBaseService resultBean = getSaleOrderDetails(sid); + //结转金额是否超过订金合计、需补交金额是否是负数 + BusSalesOrderDeposit busSalesOrderDeposit = busSalesOrderDepositService.selectByOrderSid(sid); + if(busSalesOrderDeposit.getMakeUpDeposit() != null){ + if(busSalesOrderDeposit.getMakeUpDeposit().compareTo(new BigDecimal("0"))<0){ + return rb.setMsg("订金信息存在错误，请检查"); + } + } + + /* ResultBean resultBean = getSaleOrderDetails(sid); if (!resultBean.getSuccess()) { return rb.setMsg(resultBean.getMsg()); - } + }*/ return rb.success(); } diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java index 9c95533ab7..7eef270ed0 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.java @@ -98,5 +98,5 @@ public interface BusSalesOrderDepositMapper extends BaseMapper selectByTotalValue(String sid); - int updateBySalesOrderSid(@Param("depositSum") BigDecimal depositSum, @Param("orderSid") String salesOrderSid); + int updateBySalesOrderSid(@Param("depositSum") BigDecimal depositSum, @Param("orderSid") String salesOrderSid,@Param("bigDecimalSum")BigDecimal bigDecimalSum); } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml index 080b76a426..a93be991f7 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml @@ -84,7 +84,8 @@ update bus_sales_order_deposit - set depositAll = #{depositSum} + set depositAll = #{depositSum}, + makeUpDeposit = #{bigDecimalSum} where salesOrderSid = #{orderSid} \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java index 4b4115cac4..649095548c 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java @@ -373,7 +373,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService depositFictitiousList = busDepositFictitiousService.detailsList(depositInfo.getSid()); + depositFictitiousList.removeAll(Collections.singleton(null)); + for (BusDepositFictitiousDetailsVo vo : depositFictitiousList){ + bigDecimalSum = bigDecimalSum.add(new BigDecimal(vo.getPrice())); + } + bigDecimalSum = depositSum.subtract(bigDecimalSum); + } + } //更新订金的订金合计 - busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid); + busSalesOrderDepositService.updateBySalesOrderSid(depositSum, salesOrderSid,bigDecimalSum); } return rb.success().setMsg("成功"); diff --git a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java index 8040baddea..da92e47fc1 100644 --- a/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java +++ b/anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java @@ -9,7 +9,7 @@ public enum ProcDefEnum { ORDERDEPOSITVEHICLEAPPROVE("简易订单-车辆预定", "process_pkyns85b:5:575008"), ORDERAPPROVE("订单审批", "order_approve_96asleqi:1:227504"), // CARSALECONTRACTAPPROVE("新车买卖合同审批", "car_sale_contract_asbspcvd:1:230020"), - SALESPOLICY("销售政策审批流程", "sales_policy_oxeeyzhr:1:247508"), + SALESPOLICY("销售政策审批流程", "process_biw9gfh7:1:707508"),//测试销售政策流程定义id FINBILLAPPLICATION("开票申请流程", "process_t5ksueur:1:252833"), // ADVANCEGINVOICEAPPLY("提前开票申请流程", "advance_ginvoiceapply:1:242664"), BUSCENTERADVANCEGINVOICEAPPLY("提前开票申请流程", "process_zt1gov6e:2:665066"), //本地 diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml index 32c6689d85..c47ff53087 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclepatrolinspection/ScmVehiclePatrolinspectionMapper.xml @@ -23,7 +23,9 @@