From 51d77ae90a7255d8daf9867e4391a9433b4f3035 Mon Sep 17 00:00:00 2001 From: ligaode Date: Thu, 9 Jan 2025 13:48:27 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppSpecialRebateWithApplyDetailsVo.java | 75 ++++++++ .../AppSpecialRebateWithDetailsVo.java | 69 ++++++++ .../AppSpecialRebateWithDetailssVo.java | 67 +++++++ .../ScmSpecialRebateWithApplyFeign.java | 6 +- ...cmSpecialRebateWithApplyFeignFallback.java | 5 + .../ScmVehRebateWithDetailssVo.java | 50 ++++++ .../AppVehRebateWithApplyDetailsVo.java | 75 ++++++++ .../AppVehRebateWithDetailsVo.java | 69 ++++++++ .../AppVehRebateWithDetailssVo.java | 67 +++++++ .../ScmVehRebateWithApplyDetailsVo.java | 1 + .../ScmVehRebateWithApplyFeign.java | 6 +- .../ScmVehRebateWithApplyFeignFallback.java | 166 +++++++++--------- .../ScmSpecialRebateWithMapper.java | 7 + .../ScmSpecialRebateWithMapper.xml | 52 +++++- .../ScmSpecialRebateWithService.java | 12 +- .../ScmSpecialRebateWithApplyRest.java | 5 + .../ScmSpecialRebateWithApplyService.java | 24 +++ .../ScmVehRebateWithMapper.java | 7 + .../ScmVehRebateWithMapper.xml | 43 ++++- .../ScmVehRebateWithService.java | 21 ++- .../ScmVehRebateWithApplyRest.java | 5 + .../ScmVehRebateWithApplyService.java | 36 +++- .../AppSpecialRebateWithApplyDetailsVo.java | 19 +- .../AppSpecialRebateWithDetailsVo.java | 29 ++- .../AppSpecialRebateWithDetailssVo.java | 67 +++++++ .../AppVehRebateWithApplyDetailsVo.java | 12 +- .../AppVehRebateWithDetailsVo.java | 28 ++- .../AppVehRebateWithDetailssVo.java | 67 +++++++ .../AppSpecialRebateWithApplyService.java | 13 +- .../AppVehRebateWithApplyService.java | 13 +- 30 files changed, 924 insertions(+), 192 deletions(-) create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithDetailssVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailssVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithApplyDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithDetailsVo.java create mode 100644 anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithDetailssVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailssVo.java create mode 100644 anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailssVo.java diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java new file mode 100644 index 0000000000..9d50a603f9 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmspecialrebatewithapply; + + +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.util.Date; +import java.util.List; + +/** + * Project: anrui-scm(专项返利)
+ * File: ScmSpecialRebateWithApplyVo.java
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApplyVo
+ * Description: 专项返利预提申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-09 09:14:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "专项返利预提申请表 视图数据详情", description = "专项返利预提申请表 视图数据详情") +public class AppSpecialRebateWithApplyDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建日期") + private String createTime; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("分公司-部门") + private String publishInfo; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("预提申请") + private String withApply; + @ApiModelProperty("流程实例的sid") + private String procInsId; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("专项返利预提列表") + private List scmSpecialRebateWiths; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithDetailsVo.java new file mode 100644 index 0000000000..748552e400 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithDetailsVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmspecialrebatewithapply; + + +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-scm(专项返利)
+ * File: ScmSpecialRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo
+ * Description: 专项返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-09 09:14:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "专项返利预提表 视图数据详情", description = "专项返利预提表 视图数据详情") +public class AppSpecialRebateWithDetailsVo implements Vo { + + @ApiModelProperty("采购系统名称+品牌名称+本月预提返利金额合计") + private String title; + @ApiModelProperty("预提返利合计") + private String withRebateTotal; + @ApiModelProperty("支出费用合计") + private String expectItureCostTotal; + @ApiModelProperty("待支付费用合计") + private String expectTreatCostTotal; + @ApiModelProperty("抵顶费用合计") + private String expectSuppCostTotal; + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; + + private List detail; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithDetailssVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithDetailssVo.java new file mode 100644 index 0000000000..c6ae123691 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/AppSpecialRebateWithDetailssVo.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmspecialrebatewithapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-scm(专项返利)
+ * File: ScmSpecialRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo
+ * Description: 专项返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-09 09:14:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "专项返利预提表 视图数据详情", description = "专项返利预提表 视图数据详情") +public class AppSpecialRebateWithDetailssVo implements Vo { + + private String sid; + + @ApiModelProperty("采购系统名称+品牌名称+返利类型+明细") + private String title; + @ApiModelProperty("返利类型value") + private String rebateTypeValue; + @ApiModelProperty("预提返利") + private BigDecimal withRebate; + @ApiModelProperty("其中支出费用") + private BigDecimal expectItureCost; + @ApiModelProperty("其中待支付费用") + private BigDecimal expectTreatCost; + @ApiModelProperty("其中抵顶费用") + private BigDecimal expectSuppCost; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java index f42dcb6b48..2cd248d16e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeign.java @@ -86,6 +86,11 @@ public interface ScmSpecialRebateWithApplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("移动端详情") + @GetMapping("/appDetail/{sid}") + @ResponseBody + ResultBean appDetail(@PathVariable("sid") String sid); + @ApiOperation("生成专项返利预提pdf") @PostMapping("/createPdf") @ResponseBody @@ -134,5 +139,4 @@ public interface ScmSpecialRebateWithApplyFeign { @PutMapping(value = "/assignTask") @ResponseBody public ResultBean assignTask(@RequestBody ScmSpecialRebateWithApplyDelegateQuery delegateQuery); - } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeignFallback.java index 863303265f..a388bce2e5 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewithapply/ScmSpecialRebateWithApplyFeignFallback.java @@ -77,6 +77,11 @@ public class ScmSpecialRebateWithApplyFeignFallback implements ScmSpecialRebateW return rb.setMsg("接口anrui-scm/scmspecialrebatewithapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean appDetail(String sid) { + return null; + } + @Override public ResultBean createPdf(String specialWithSid, String userName) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailssVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailssVo.java new file mode 100644 index 0000000000..0fef7192d2 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ScmVehRebateWithDetailssVo.java @@ -0,0 +1,50 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehrebatewith; + +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.List; + +@Data +@ApiModel(value = "单车返利预提表 视图数据详情", description = "单车返利预提表 视图数据详情") +public class ScmVehRebateWithDetailssVo implements Vo { + + @ApiModelProperty("采购系统名称+品牌名称+本月预提返利金额合计") + private String title; + @ApiModelProperty("预提返利合计") + private String withRebateTotal; + @ApiModelProperty("待支付费用合计") + private String expectTreatCostTotal; + @ApiModelProperty("抵顶费用合计") + private String expectSuppCostTotal; + @ApiModelProperty("台数合计") + private String numTotal; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithApplyDetailsVo.java new file mode 100644 index 0000000000..6010b74338 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithApplyDetailsVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehrebatewithapply; + + +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.util.Date; +import java.util.List; + +/** + * Project: anrui-scm(单车返利预提申请)
+ * File: ScmVehRebateWithApplyVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehrebatewithapply.ScmVehRebateWithApplyVo
+ * Description: 单车返利预提申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-25 09:04:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "单车返利预提申请表 视图数据详情", description = "单车返利预提申请表 视图数据详情") +public class AppVehRebateWithApplyDetailsVo implements Vo { + + private String sid; // sid + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("创建日期") + private String createTime; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("分公司-部门") + private String publishInfo; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("预提申请") + private String withApply; + @ApiModelProperty("流程实例的sid") + private String procInsId; + @ApiModelProperty("任务id") + private String taskId; + @ApiModelProperty("单车返利预提列表") + private List scmVehRebateWiths; // 单车返利预提列表 +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithDetailsVo.java new file mode 100644 index 0000000000..15973e1875 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithDetailsVo.java @@ -0,0 +1,69 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehrebatewithapply; + + +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-scm(单车返利预提申请)
+ * File: ScmVehRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo
+ * Description: 单车返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-25 09:04:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "单车返利预提表 视图数据详情", description = "单车返利预提表 视图数据详情") +public class AppVehRebateWithDetailsVo implements Vo { + + @ApiModelProperty("采购系统名称+品牌名称+本月预提返利金额合计") + private String title; + @ApiModelProperty("预提返利合计") + private String withRebateTotal; + @ApiModelProperty("待支付费用合计") + private String expectTreatCostTotal; + @ApiModelProperty("抵顶费用合计") + private String expectSuppCostTotal; + @ApiModelProperty("台数合计") + private String numTotal; + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; + + private List detail; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithDetailssVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithDetailssVo.java new file mode 100644 index 0000000000..192398e4de --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/AppVehRebateWithDetailssVo.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehrebatewithapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-scm(单车返利预提申请)
+ * File: ScmVehRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo
+ * Description: 单车返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-25 09:04:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "单车返利预提表 视图数据详情", description = "单车返利预提表 视图数据详情") +public class AppVehRebateWithDetailssVo implements Vo { + + private String sid; + + @ApiModelProperty("采购系统名称+品牌名称+返利类型+明细") + private String title; + @ApiModelProperty("返利类型value") + private String rebateTypeValue; + @ApiModelProperty("预提返利") + private BigDecimal withRebate; + @ApiModelProperty("其中待支付费用") + private BigDecimal expectTreatCost; + @ApiModelProperty("其中抵顶费用") + private BigDecimal expectSuppCost; + @ApiModelProperty("台数") + private String num; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java index c62f7203af..36e6831b13 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyDetailsVo.java @@ -28,6 +28,7 @@ package com.yxt.anrui.scm.api.scmvehrebatewithapply; import com.fasterxml.jackson.annotation.JsonFormat; import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailssVo; import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto; import com.yxt.common.core.vo.Vo; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeign.java index b11d5ecaea..393afffb53 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeign.java @@ -65,7 +65,6 @@ public interface ScmVehRebateWithApplyFeign { @PostMapping("/rePushVoucher") public ResultBean rePushVoucher(@RequestParam("sid") String sid); - @ApiOperation("根据条件分页查询数据的列表") @PostMapping("/listPage") @ResponseBody @@ -86,6 +85,11 @@ public interface ScmVehRebateWithApplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("移动端详情") + @GetMapping("/appDetail/{sid}") + @ResponseBody + ResultBean appDetail(@PathVariable("sid") String sid); + @ApiOperation("生成单车返利预提pdf") @PostMapping("/createPdf") @ResponseBody diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java index 40bd10b03e..65f262b19b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewithapply/ScmVehRebateWithApplyFeignFallback.java @@ -50,84 +50,90 @@ import java.util.List; @Component public class ScmVehRebateWithApplyFeignFallback implements ScmVehRebateWithApplyFeign { - @Override - public ResultBean rePushVoucher(String sid) { - return null; - } - @Override - public ResultBean> listPage(PagerQuery pq){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmvehrebatewithapply/listPage无法访问"); - } - - @Override - public ResultBean save(ScmVehRebateWithApplyDto dto){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatewithapply/save无法访问"); - } - - @Override - public ResultBean delBySids( String[] sids){ - return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatewithapply/delBySids无法访问"); - } - - @Override - public ResultBean fetchDetailsBySid(String sid){ - ResultBean rb = ResultBean.fireFail(); - return rb.setMsg("接口anrui-scm/scmvehrebatewithapply/fetchDetailsBySid无法访问"); - } - - @Override - public ResultBean createPdf(String vehWithSid, String userName) { - return null; - } - - @Override - public ResultBean submitVehRebateWithApply(SubmitScmVehRebateWithApplyDto dto) { - return null; - } - - @Override - public ResultBean complete(ScmVehRebateWithApplyCompleteDto dto) { - return null; - } - - @Override - public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { - return null; - } - - @Override - public ResultBean taskReject(FlowTaskVo flowTaskVo) { - return null; - } - - @Override - public ResultBean breakProcess(FlowTaskVo flowTaskVo) { - return null; - } - - @Override - public ResultBean flowRecord(String procInsId) { - return null; - } - - @Override - public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { - return null; - } - - @Override - public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { - return null; - } - - @Override - public ResultBean delegate(ScmVehRebateWithApplyDelegateQuery delegateQuery) { - return null; - } - - @Override - public ResultBean assignTask(ScmVehRebateWithApplyDelegateQuery delegateQuery) { - return null; - } + @Override + public ResultBean rePushVoucher(String sid) { + return null; + } + + @Override + public ResultBean> listPage(PagerQuery pq) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmvehrebatewithapply/listPage无法访问"); + } + + @Override + public ResultBean save(ScmVehRebateWithApplyDto dto) { + return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatewithapply/save无法访问"); + } + + @Override + public ResultBean delBySids(String[] sids) { + return ResultBean.fireFail().setMsg("接口anrui-scm/scmvehrebatewithapply/delBySids无法访问"); + } + + @Override + public ResultBean fetchDetailsBySid(String sid) { + ResultBean rb = ResultBean.fireFail(); + return rb.setMsg("接口anrui-scm/scmvehrebatewithapply/fetchDetailsBySid无法访问"); + } + + @Override + public ResultBean appDetail(String sid) { + return null; + } + + @Override + public ResultBean createPdf(String vehWithSid, String userName) { + return null; + } + + @Override + public ResultBean submitVehRebateWithApply(SubmitScmVehRebateWithApplyDto dto) { + return null; + } + + @Override + public ResultBean complete(ScmVehRebateWithApplyCompleteDto dto) { + return null; + } + + @Override + public ResultBean revokeProcess(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean taskReject(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean breakProcess(FlowTaskVo flowTaskVo) { + return null; + } + + @Override + public ResultBean flowRecord(String procInsId) { + return null; + } + + @Override + public ResultBean> getNextNodesForSubmit(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean> getPreviousNodesForReject(GetNodeQuery query) { + return null; + } + + @Override + public ResultBean delegate(ScmVehRebateWithApplyDelegateQuery delegateQuery) { + return null; + } + + @Override + public ResultBean assignTask(ScmVehRebateWithApplyDelegateQuery delegateQuery) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java index 80212c6f7b..c7d541ad58 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.java @@ -27,8 +27,11 @@ package com.yxt.anrui.scm.biz.scmspecialrebatewith; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmspecialrebatewithapply.AppSpecialRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmspecialrebatewithapply.AppSpecialRebateWithDetailssVo; 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.scm.api.scmspecialrebatewith.ScmSpecialRebateWith; @@ -59,4 +62,8 @@ public interface ScmSpecialRebateWithMapper extends BaseMapper fetchSpecialReBateSidByMainSid(String businessSid); List fetchBySpecialReBateSid(String sid); + + List fetchByMainSidNew(String sid); + + List fetchByMainSidNewTwo(@Param("sid") String sid, @Param("purchaseSystemName") String purchaseSystemName, @Param("brandName") String brandName); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml index 3d0733f32e..0dcb58dd52 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithMapper.xml @@ -6,20 +6,20 @@ @@ -28,4 +28,38 @@ FROM scm_special_rebate_with WHERE specialRebateSid = #{sid} + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java index 29c840fd7f..f74cd2fa31 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java @@ -28,6 +28,8 @@ package com.yxt.anrui.scm.biz.scmspecialrebatewith; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebate; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; +import com.yxt.anrui.scm.api.scmspecialrebatewithapply.AppSpecialRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmspecialrebatewithapply.AppSpecialRebateWithDetailssVo; import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; @@ -85,7 +87,7 @@ public class ScmSpecialRebateWithService extends MybatisBaseService fetchBySpecialReBateSid(String sid) { return baseMapper.fetchBySpecialReBateSid(sid); } + + public List fetchByMainSidNew(String sid) { + return baseMapper.fetchByMainSidNew(sid); + } + + public List fetchByMainSidNewTwo(String sid, String purchaseSystemName, String brandName) { + return baseMapper.fetchByMainSidNewTwo(sid, purchaseSystemName, brandName); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java index a4d15a2965..c9cd67f7c6 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyRest.java @@ -100,6 +100,11 @@ public class ScmSpecialRebateWithApplyRest implements ScmSpecialRebateWithApplyF return scmSpecialRebateWithApplyService.fetchAllDetailsVo(sid); } + @Override + public ResultBean appDetail(String sid) { + return scmSpecialRebateWithApplyService.appDetail(sid); + } + @Override public ResultBean createPdf(String specialWithSid, String userName) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java index 3b04e81446..4a7635caeb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewithapply/ScmSpecialRebateWithApplyService.java @@ -63,6 +63,8 @@ import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.ScmSpecialRebateWithApplyDelegateQuery; import com.yxt.anrui.scm.api.scmspecialrebatewithapply.flow.SubmitScmSpecialRebateWithApplyDto; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailssVo; import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService; import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService; @@ -815,4 +817,26 @@ public class ScmSpecialRebateWithApplyService extends MybatisBaseService appDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppSpecialRebateWithApplyDetailsVo appSpecialRebateWithApplyDetailsVo = new AppSpecialRebateWithApplyDetailsVo(); + ScmSpecialRebateWithApply scmSpecialRebateWithApply = fetchBySid(sid); + appSpecialRebateWithApplyDetailsVo.setSid(sid); + appSpecialRebateWithApplyDetailsVo.setBillNo(scmSpecialRebateWithApply.getBillNo()); + appSpecialRebateWithApplyDetailsVo.setCreateTime(DateUtil.formatDate(scmSpecialRebateWithApply.getCreateTime())); + appSpecialRebateWithApplyDetailsVo.setCreateByName(scmSpecialRebateWithApply.getCreateByName()); + appSpecialRebateWithApplyDetailsVo.setPublishInfo(scmSpecialRebateWithApply.getCreateOrgName() + "-" + scmSpecialRebateWithApply.getDeptName()); + appSpecialRebateWithApplyDetailsVo.setRemarks(scmSpecialRebateWithApply.getRemarks()); + appSpecialRebateWithApplyDetailsVo.setWithApply(scmSpecialRebateWithApply.getWithApply()); + appSpecialRebateWithApplyDetailsVo.setProcInsId(scmSpecialRebateWithApply.getProcInstId()); + appSpecialRebateWithApplyDetailsVo.setTaskId(scmSpecialRebateWithApply.getTaskId()); + List appSpecialRebateWithDetailsVos = scmSpecialRebateWithService.fetchByMainSidNew(sid); + for (AppSpecialRebateWithDetailsVo appSpecialRebateWithDetailsVo : appSpecialRebateWithDetailsVos) { + List appSpecialRebateWithDetailssVos = scmSpecialRebateWithService.fetchByMainSidNewTwo(sid, appSpecialRebateWithDetailsVo.getPurchaseSystemName(), appSpecialRebateWithDetailsVo.getBrandName()); + appSpecialRebateWithDetailsVo.setDetail(appSpecialRebateWithDetailssVos); + } + appSpecialRebateWithApplyDetailsVo.setScmSpecialRebateWiths(appSpecialRebateWithDetailsVos); + return rb.success().setData(appSpecialRebateWithApplyDetailsVo); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java index aae1c108ee..4e0c9d2591 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.java @@ -30,6 +30,9 @@ 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.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailssVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailssVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -75,4 +78,8 @@ public interface ScmVehRebateWithMapper extends BaseMapper { @Select("select * from scm_veh_rebate_with where mainSid = #{businessSid}") List selByMainSid(String businessSid); + + List fetchByMainSidNew(String sid); + + List fetchByMainSidNewTwo(@Param("sid") String sid,@Param("purchaseSystemName") String purchaseSystemName,@Param("brandName") String brandName); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml index 109e496af8..5a42790f67 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithMapper.xml @@ -20,11 +20,11 @@ + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java index a4eb36c235..82cdfc4b7e 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithService.java @@ -35,6 +35,9 @@ import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDto; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateVehDto; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo; +import com.yxt.anrui.scm.api.scmvehrebatewith.*; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithDetailssVo; import com.yxt.anrui.scm.biz.scmvehrebate.ScmVehRebateService; import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; import org.apache.commons.lang3.StringUtils; @@ -43,12 +46,6 @@ 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.scm.api.scmvehrebatewith.ScmVehRebateWith; -import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithQuery; -import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo; -import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo; -import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto; -import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithFeign; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -113,7 +110,7 @@ public class ScmVehRebateWithService extends MybatisBaseService selByMainSid(String businessSid) { return baseMapper.selByMainSid(businessSid); } + + public List fetchByMainSidNew(String sid) { + return baseMapper.fetchByMainSidNew(sid); + } + + public List fetchByMainSidNewTwo(String sid, String purchaseSystemName, String brandName) { + return baseMapper.fetchByMainSidNewTwo(sid, purchaseSystemName, brandName); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java index 15af6049ed..8e64c65242 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyRest.java @@ -99,6 +99,11 @@ public class ScmVehRebateWithApplyRest implements ScmVehRebateWithApplyFeign { return scmVehRebateWithApplyService.fetchAllDetailsVo(sid); } + @Override + public ResultBean appDetail(String sid) { + return scmVehRebateWithApplyService.appDetail(sid); + } + @Override public ResultBean createPdf(String vehWithSid, String userName) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java index a706aebc92..34844f33cf 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewithapply/ScmVehRebateWithApplyService.java @@ -59,10 +59,7 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.scm.api.flow.FlowTaskVo; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate; -import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWith; -import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo; -import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDto; -import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithPdfVo; +import com.yxt.anrui.scm.api.scmvehrebatewith.*; import com.yxt.anrui.scm.api.scmvehrebatewithapply.*; import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo; @@ -435,6 +432,7 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService scmVehRebateWiths = scmVehRebateWithApplyDetailsVo.getScmVehRebateWiths(); Map dataMap = new HashMap(); //标题 - dataMap.put("title",scmVehRebateWithApplyDetailsVo.getWithApply() + "单车返利预提审批"); + dataMap.put("title", scmVehRebateWithApplyDetailsVo.getWithApply() + "单车返利预提审批"); //分公司 dataMap.put("useOrgName", scmVehRebateWithApplyDetailsVo.getCreateOrgName()); //创建部门 @@ -897,4 +895,26 @@ public class ScmVehRebateWithApplyService extends MybatisBaseService appDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppVehRebateWithApplyDetailsVo appVehRebateWithApplyDetailsVo = new AppVehRebateWithApplyDetailsVo(); + ScmVehRebateWithApply scmVehRebateWithApply = fetchBySid(sid); + appVehRebateWithApplyDetailsVo.setSid(sid); + appVehRebateWithApplyDetailsVo.setBillNo(scmVehRebateWithApply.getBillNo()); + appVehRebateWithApplyDetailsVo.setCreateTime(DateUtil.formatDate(scmVehRebateWithApply.getCreateTime())); + appVehRebateWithApplyDetailsVo.setCreateByName(scmVehRebateWithApply.getCreateByName()); + appVehRebateWithApplyDetailsVo.setPublishInfo(scmVehRebateWithApply.getCreateOrgName() + "-" + scmVehRebateWithApply.getDeptName()); + appVehRebateWithApplyDetailsVo.setRemarks(scmVehRebateWithApply.getRemarks()); + appVehRebateWithApplyDetailsVo.setWithApply(scmVehRebateWithApply.getWithApply()); + appVehRebateWithApplyDetailsVo.setProcInsId(scmVehRebateWithApply.getProcInstId()); + appVehRebateWithApplyDetailsVo.setTaskId(scmVehRebateWithApply.getTaskId()); + List appVehRebateWithDetailsVos = scmVehRebateWithService.fetchByMainSidNew(sid); + for (AppVehRebateWithDetailsVo appVehRebateWithDetailsVo : appVehRebateWithDetailsVos) { + List appVehRebateWithDetailssVos = scmVehRebateWithService.fetchByMainSidNewTwo(sid, appVehRebateWithDetailsVo.getPurchaseSystemName(), appVehRebateWithDetailsVo.getBrandName()); + appVehRebateWithDetailsVo.setDetail(appVehRebateWithDetailssVos); + } + appVehRebateWithApplyDetailsVo.setScmVehRebateWiths(appVehRebateWithDetailsVos); + return rb.success().setData(appVehRebateWithApplyDetailsVo); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java index 7ed4ac9003..d777f8c0c9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyDetailsVo.java @@ -54,34 +54,23 @@ public class AppSpecialRebateWithApplyDetailsVo implements Vo { private String sid; // sid - private String publishInfo; @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @ApiModelProperty("创建日期") private Date createTime; - @ApiModelProperty("创建组织名称") - private String createOrgName; - @ApiModelProperty("申请部门名称") - private String deptName; @ApiModelProperty("创建人姓名") private String createByName; + @ApiModelProperty("分公司-部门") + private String publishInfo; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("预提申请") private String withApply; @ApiModelProperty("流程实例的sid") private String procInsId; - @ApiModelProperty("taskId") + @ApiModelProperty("任务id") private String taskId; - @ApiModelProperty("预提返利合计") - private String withRebateTotal; - @ApiModelProperty("预计支出费用合计") - private String expectItureCostTotal; - @ApiModelProperty("预计待支付费用合计") - private String expectTreatCostTotal; - @ApiModelProperty("预计抵顶费用合计") - private String expectSuppCostTotal; @ApiModelProperty("专项返利预提列表") private List scmSpecialRebateWiths; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailsVo.java index e847ca3920..ed90aacf45 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.terminal.api.autoservice.specialrebatewithapply; +import com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply.AppVehRebateWithDetailssVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -51,22 +52,16 @@ import java.util.List; @ApiModel(value = "专项返利预提表 视图数据详情", description = "专项返利预提表 视图数据详情") public class AppSpecialRebateWithDetailsVo implements Vo { - private String sid; + @ApiModelProperty("采购系统名称+品牌名称+本月预提返利金额合计") + private String title; + @ApiModelProperty("预提返利合计") + private String withRebateTotal; + @ApiModelProperty("支出费用合计") + private String expectItureCostTotal; + @ApiModelProperty("待支付费用合计") + private String expectTreatCostTotal; + @ApiModelProperty("抵顶费用合计") + private String expectSuppCostTotal; - @ApiModelProperty("采购系统名称") - private String purchaseSystemName; - @ApiModelProperty("品牌名称") - private String brandName; - @ApiModelProperty("返利类型value") - private String rebateTypeValue; - @ApiModelProperty("预提返利") - private BigDecimal withRebate; - @ApiModelProperty("预计支出费用") - private BigDecimal expectItureCost; - @ApiModelProperty("预计待支付费用") - private BigDecimal expectTreatCost; - @ApiModelProperty("预计抵顶费用") - private BigDecimal expectSuppCost; - @ApiModelProperty("专项返利sid") - private String specialRebateSid; + private List detail; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailssVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailssVo.java new file mode 100644 index 0000000000..1bce743c47 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/specialrebatewithapply/AppSpecialRebateWithDetailssVo.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.autoservice.specialrebatewithapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-scm(专项返利)
+ * File: ScmSpecialRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatewith.ScmSpecialRebateWithVo
+ * Description: 专项返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-09-09 09:14:10
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "专项返利预提表 视图数据详情", description = "专项返利预提表 视图数据详情") +public class AppSpecialRebateWithDetailssVo implements Vo { + + private String sid; + + @ApiModelProperty("采购系统名称+品牌名称+返利类型+明细") + private String title; + @ApiModelProperty("返利类型value") + private String rebateTypeValue; + @ApiModelProperty("预提返利") + private BigDecimal withRebate; + @ApiModelProperty("其中支出费用") + private BigDecimal expectItureCost; + @ApiModelProperty("其中待支付费用") + private BigDecimal expectTreatCost; + @ApiModelProperty("其中抵顶费用") + private BigDecimal expectSuppCost; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyDetailsVo.java index 4e0832e239..d8f4cf4cef 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithApplyDetailsVo.java @@ -59,12 +59,10 @@ public class AppVehRebateWithApplyDetailsVo implements Vo { @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; - @ApiModelProperty("部门") - private String deptName; - @ApiModelProperty("创建组织名称") - private String createOrgName; @ApiModelProperty("创建人姓名") private String createByName; + @ApiModelProperty("分公司-部门") + private String publishInfo; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("预提申请") @@ -73,12 +71,6 @@ public class AppVehRebateWithApplyDetailsVo implements Vo { private String procInsId; @ApiModelProperty("任务id") private String taskId; - @ApiModelProperty("预提返利合计") - private String withRebateTotal; - @ApiModelProperty("其中待支付费用合计") - private String expectTreatCostTotal; - @ApiModelProperty("其中抵顶费用合计") - private String expectSuppCostTotal; @ApiModelProperty("单车返利预提列表") private List scmVehRebateWiths; // 单车返利预提列表 } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailsVo.java index b3e8bb61f9..5ee13982c2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailsVo.java @@ -51,22 +51,16 @@ import java.util.List; @ApiModel(value = "单车返利预提表 视图数据详情", description = "单车返利预提表 视图数据详情") public class AppVehRebateWithDetailsVo implements Vo { - private String sid; // sid + @ApiModelProperty("采购系统名称+品牌名称+本月预提返利金额合计") + private String title; + @ApiModelProperty("预提返利合计") + private String withRebateTotal; + @ApiModelProperty("待支付费用合计") + private String expectTreatCostTotal; + @ApiModelProperty("抵顶费用合计") + private String expectSuppCostTotal; + @ApiModelProperty("台数合计") + private String numTotal; - @ApiModelProperty("采购系统") - private String purchaseSystemName; - @ApiModelProperty("品牌名称") - private String brandName; - @ApiModelProperty("返利类型value") - private String rebateTypeValue; - @ApiModelProperty("台数") - private String num; - @ApiModelProperty("预提返利") - private BigDecimal withRebate; - @ApiModelProperty("其中待支付费用") - private BigDecimal expectTreatCost; - @ApiModelProperty("其中抵顶费用") - private BigDecimal expectSuppCost; - @ApiModelProperty("单车返利sid") - private String vehRebateSid; + private List detail; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailssVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailssVo.java new file mode 100644 index 0000000000..b6f3abaa7a --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatewithapply/AppVehRebateWithDetailssVo.java @@ -0,0 +1,67 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.math.BigDecimal; + +/** + * Project: anrui-scm(单车返利预提申请)
+ * File: ScmVehRebateWithVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo
+ * Description: 单车返利预提表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-25 09:04:39
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "单车返利预提表 视图数据详情", description = "单车返利预提表 视图数据详情") +public class AppVehRebateWithDetailssVo implements Vo { + + private String sid; + + @ApiModelProperty("采购系统名称+品牌名称+返利类型+明细") + private String title; + @ApiModelProperty("返利类型value") + private String rebateTypeValue; + @ApiModelProperty("预提返利") + private BigDecimal withRebate; + @ApiModelProperty("其中待支付费用") + private BigDecimal expectTreatCost; + @ApiModelProperty("其中抵顶费用") + private BigDecimal expectSuppCost; + @ApiModelProperty("台数") + private String num; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java index 08922307a7..19af05c61c 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/autoservice/specialrebatewithapply/AppSpecialRebateWithApplyService.java @@ -43,6 +43,7 @@ import com.yxt.anrui.terminal.api.autoservice.specialrebatewithapply.AppSpecialR import com.yxt.anrui.terminal.api.autoservice.specialrebatewithapply.AppSpecialRebateWithApplyDetailsVo; import com.yxt.anrui.terminal.api.autoservice.specialrebatewithapply.AppSpecialRebateWithDetailsVo; import com.yxt.anrui.terminal.api.autoservice.specialrebatewithapply.flowable.*; +import com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply.AppVehRebateWithApplyDetailsVo; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -67,19 +68,9 @@ public class AppSpecialRebateWithApplyService { public ResultBean fetchDetailsBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - ScmSpecialRebateWithApplyDetailsVo data = scmSpecialRebateWithApplyFeign.fetchDetailsBySid(sid).getData(); AppSpecialRebateWithApplyDetailsVo appSpecialRebateWithApplyDetailsVo = new AppSpecialRebateWithApplyDetailsVo(); - appSpecialRebateWithApplyDetailsVo.setProcInsId(data.getProcInstId()); - appSpecialRebateWithApplyDetailsVo.setPublishInfo(data.getCreateOrgName() + "-" + data.getDeptName()); + com.yxt.anrui.scm.api.scmspecialrebatewithapply.AppSpecialRebateWithApplyDetailsVo data = scmSpecialRebateWithApplyFeign.appDetail(sid).getData(); BeanUtil.copyProperties(data,appSpecialRebateWithApplyDetailsVo); - List scmSpecialRebateWiths = appSpecialRebateWithApplyDetailsVo.getScmSpecialRebateWiths(); - for (AppSpecialRebateWithDetailsVo appSpecialRebateWithDetailsVo : scmSpecialRebateWiths) { - appSpecialRebateWithDetailsVo.setSid(appSpecialRebateWithDetailsVo.getSpecialRebateSid()); - } - appSpecialRebateWithApplyDetailsVo.setWithRebateTotal(scmSpecialRebateWiths.stream().map(AppSpecialRebateWithDetailsVo::getWithRebate).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); - appSpecialRebateWithApplyDetailsVo.setExpectItureCostTotal(scmSpecialRebateWiths.stream().map(AppSpecialRebateWithDetailsVo::getExpectItureCost).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); - appSpecialRebateWithApplyDetailsVo.setExpectTreatCostTotal(scmSpecialRebateWiths.stream().map(AppSpecialRebateWithDetailsVo::getExpectTreatCost).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); - appSpecialRebateWithApplyDetailsVo.setExpectSuppCostTotal(scmSpecialRebateWiths.stream().map(AppSpecialRebateWithDetailsVo::getExpectSuppCost).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); return rb.success().setData(appSpecialRebateWithApplyDetailsVo); } diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java index 6ccdb15ba4..dff73d6951 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatewithapply/AppVehRebateWithApplyService.java @@ -31,6 +31,8 @@ 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.anrui.scm.api.flow.FlowTaskVo; +import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithDetailssVo; import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeQuery; import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.GetNodeVo; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; @@ -42,6 +44,7 @@ import com.yxt.anrui.scm.api.scmvehrebatewithapply.flow.ScmVehRebateWithApplyDel import com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply.AppVehRebateDetailsVo; import com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply.AppVehRebateWithApplyDetailsVo; import com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply.AppVehRebateWithDetailsVo; +import com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply.AppVehRebateWithDetailssVo; import com.yxt.anrui.terminal.api.supplychain.vehrebatewithapply.flowable.*; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; @@ -67,17 +70,9 @@ public class AppVehRebateWithApplyService { public ResultBean fetchDetailsBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - ScmVehRebateWithApplyDetailsVo data = scmVehRebateWithApplyFeign.fetchDetailsBySid(sid).getData(); AppVehRebateWithApplyDetailsVo appVehRebateWithApplyDetailsVo = new AppVehRebateWithApplyDetailsVo(); - appVehRebateWithApplyDetailsVo.setProcInsId(data.getProcInstId()); + com.yxt.anrui.scm.api.scmvehrebatewithapply.AppVehRebateWithApplyDetailsVo data = scmVehRebateWithApplyFeign.appDetail(sid).getData(); BeanUtil.copyProperties(data,appVehRebateWithApplyDetailsVo); - List scmVehRebateWiths = appVehRebateWithApplyDetailsVo.getScmVehRebateWiths(); - for (AppVehRebateWithDetailsVo appVehRebateWithDetailsVo : scmVehRebateWiths) { - appVehRebateWithDetailsVo.setSid(appVehRebateWithDetailsVo.getVehRebateSid()); - } - appVehRebateWithApplyDetailsVo.setWithRebateTotal(scmVehRebateWiths.stream().map(AppVehRebateWithDetailsVo::getWithRebate).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); - appVehRebateWithApplyDetailsVo.setExpectTreatCostTotal(scmVehRebateWiths.stream().map(AppVehRebateWithDetailsVo::getExpectTreatCost).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); - appVehRebateWithApplyDetailsVo.setExpectSuppCostTotal(scmVehRebateWiths.stream().map(AppVehRebateWithDetailsVo::getExpectSuppCost).reduce(BigDecimal.ZERO,BigDecimal::add).toString()); return rb.success().setData(appVehRebateWithApplyDetailsVo); }