diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java new file mode 100644 index 0000000000..7e746a511e --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmspecialrebatecheckapply; + + +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: ScmSpecialrebateCheckapplyVo.java
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo
+ * 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 AppSpecialrebateCheckapplyDetailsVo implements Vo { + + private String sid; + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("分公司-部门") + private String publishInfo; + @ApiModelProperty("核对申请标题") + private String checkApply; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("创建日期") + private String createTime; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("流程实例的sid") + private String procInsId; + @ApiModelProperty("taskId") + private String taskId; + @ApiModelProperty("按返利类型统计") + private List scmWhenSpecialrebateCheckapplydetailDetails; + @ApiModelProperty("按预提年月统计") + private List scmLastSpecialrebateCheckapplydetailDetails; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java new file mode 100644 index 0000000000..a82ea80453 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java @@ -0,0 +1,75 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmspecialrebatecheckapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +/** + * Project: anrui-scm(专项返利)
+ * File: ScmSpecialrebateCheckapplydetailVo.java
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo
+ * 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 +public class AppSpecialrebateCheckapplydetailDetailsVo implements Vo { + + @ApiModelProperty("采购系统名称+品牌名称+本月上传返利核对及调整金额合计") + private String title; + @ApiModelProperty("数量合计") + private String numTotal; + @ApiModelProperty("预提金额合计") + private String withRebateTotal; + @ApiModelProperty("其中预提费用合计") + private String withholdCostTotal; + @ApiModelProperty("上传金额合计") + private String uploadMoneyTotal; + @ApiModelProperty("其中费用合计") + private String moneyTotal; + @ApiModelProperty("其中待确认金额合计") + private String stayDetermineMoneyTotal; + @ApiModelProperty("返利调整金额合计") + private String adjustmentMoneyTotal; + @ApiModelProperty("其中费用调整金额合计") + private String fyAdjustmentMoneyTotal; + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; + + private List details; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailssVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailssVo.java new file mode 100644 index 0000000000..cd1cd3f223 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailssVo.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmspecialrebatecheckapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(专项返利)
+ * File: ScmSpecialrebateCheckapplydetailVo.java
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo
+ * 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 AppSpecialrebateCheckapplydetailDetailssVo implements Vo { + + private String sid; + @ApiModelProperty("采购系统名称+品牌名称+返利类型+明细") + private String title; + @ApiModelProperty("返利类型") + private String rebateTypeValue; + @ApiModelProperty("预提年月") + private String withholdingDate; + @ApiModelProperty("数量") + private String num; + @ApiModelProperty("预提金额") + private String withRebate; + @ApiModelProperty("其中预提费用") + private String withholdCost; + @ApiModelProperty("上传金额") + private String uploadMoney; + @ApiModelProperty("其中费用") + private String money; + @ApiModelProperty("其中待确认金额") + private String stayDetermineMoney; + @ApiModelProperty("返利调整金额") + private String adjustmentMoney; + @ApiModelProperty("其中费用调整金额") + private String fyAdjustmentMoney; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java index e1ed7539b4..9f2fd11c8a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeign.java @@ -86,6 +86,11 @@ public interface ScmSpecialrebateCheckapplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("app详情") + @GetMapping("/appDetail/{sid}") + @ResponseBody + ResultBean appDetail(@PathVariable("sid") String sid); + @ApiOperation("生成专项返利核对pdf") @PostMapping("/createPdf") @ResponseBody @@ -134,5 +139,4 @@ public interface ScmSpecialrebateCheckapplyFeign { @PutMapping(value = "/assignTask") @ResponseBody public ResultBean assignTask(@RequestBody ScmSpecialRebateCheckApplyDelegateQuery delegateQuery); - } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java index 4200fa9e16..500f6f60fe 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyFeignFallback.java @@ -80,6 +80,11 @@ public class ScmSpecialrebateCheckapplyFeignFallback implements ScmSpecialrebate return rb.setMsg("接口anrui-scm/scmspecialrebatecheckapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean appDetail(String sid) { + return null; + } + @Override public ResultBean createPdf(String specialCheckSid, String userName) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java index d3bba1cb26..03ef7ba44b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeign.java @@ -61,4 +61,9 @@ public interface ScmSpecialrebateCheckapplydetailFeign { @GetMapping("/specialRebateCheckDetails/{sid}") @ResponseBody public ResultBean> specialRebateCheckDetails(@PathVariable("sid") String sid); + + @ApiOperation("app查询明细") + @GetMapping("/appMx/{sid}") + @ResponseBody + ResultBean> appMx(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java index 1915e13e4c..d39d4e4c84 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailFeignFallback.java @@ -40,4 +40,9 @@ public class ScmSpecialrebateCheckapplydetailFeignFallback implements ScmSpecial public ResultBean> specialRebateCheckDetails(String sid) { return null; } + + @Override + public ResultBean> appMx(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java new file mode 100644 index 0000000000..b473a4c651 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java @@ -0,0 +1,77 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehrebatecheckapply; + + +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: ScmVehrebateCheckapplyVo.java
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo
+ * Description: 单车返利核对申请表 视图数据对象.
+ * Copyright: Copyright (c) 2011
+ * Company: https://gitee.com/liuzp315
+ * Makedate: 2022-08-29 16:01:01
+ * + * @author liupopo + * @version 1.0 + * @since 1.0 + */ +@Data +@ApiModel(value = "单车返利核对申请表 视图数据详情", description = "单车返利核对申请表 视图数据详情") +public class AppVehrebateCheckapplyDetailsVo implements Vo { + + private String sid; + + @ApiModelProperty("单据编号") + private String billNo; + @ApiModelProperty("分公司-部门") + private String publishInfo; + @ApiModelProperty("核对申请标题") + private String checkApply; + @ApiModelProperty("创建人姓名") + private String createByName; + @ApiModelProperty("创建日期") + private String createTime; + @ApiModelProperty("备注") + private String remarks; + @ApiModelProperty("流程实例的sid") + private String procInsId; + @ApiModelProperty("taskId") + private String taskId; + @ApiModelProperty("按返利类型统计") + private List scmWhenVehrebateCheckapplydetailDetails; + @ApiModelProperty("按预提年月统计") + private List scmLastVehrebateCheckapplydetailDetails; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java new file mode 100644 index 0000000000..e6088b30b6 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java @@ -0,0 +1,61 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehrebatecheckapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class AppVehrebateCheckapplydetailDetailsVo implements Vo { + + @ApiModelProperty("采购系统名称+品牌名称+本月上传返利核对及调整金额合计") + private String title; + @ApiModelProperty("数量合计") + private String numTotal; + @ApiModelProperty("预提金额合计") + private String withRebateTotal; + @ApiModelProperty("其中预提费用合计") + private String withholdCostTotal; + @ApiModelProperty("上传金额合计") + private String uploadMoneyTotal; + @ApiModelProperty("其中费用合计") + private String moneyTotal; + @ApiModelProperty("其中待确认金额合计") + private String stayDetermineMoneyTotal; + @ApiModelProperty("返利调整金额合计") + private String adjustmentMoneyTotal; + @ApiModelProperty("其中费用调整金额合计") + private String fyAdjustmentMoneyTotal; + @ApiModelProperty("采购系统") + private String purchaseSystemName; + @ApiModelProperty("品牌名称") + private String brandName; + + private List details; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/AppVehrebateCheckapplydetailDetailssVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/AppVehrebateCheckapplydetailDetailssVo.java new file mode 100644 index 0000000000..d8b06462f0 --- /dev/null +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/AppVehrebateCheckapplydetailDetailssVo.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.scm.api.scmvehrebatecheckapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppVehrebateCheckapplydetailDetailssVo implements Vo { + + private String sid; + @ApiModelProperty("采购系统名称+品牌名称+返利类型+明细") + private String title; + @ApiModelProperty("返利类型") + private String rebateTypeValue; + @ApiModelProperty("预提年月") + private String withholdingDate; + @ApiModelProperty("数量") + private String num; + @ApiModelProperty("预提金额") + private String withRebate; + @ApiModelProperty("其中预提费用") + private String withholdCost; + @ApiModelProperty("上传金额") + private String uploadMoney; + @ApiModelProperty("其中费用") + private String money; + @ApiModelProperty("其中待确认金额") + private String stayDetermineMoney; + @ApiModelProperty("返利调整金额") + private String adjustmentMoney; + @ApiModelProperty("其中费用调整金额") + private String fyAdjustmentMoney; +} \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java index c9d9d08cfa..8cec8f23c9 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeign.java @@ -87,6 +87,11 @@ public interface ScmVehrebateCheckapplyFeign { @ResponseBody public ResultBean fetchDetailsBySid(@PathVariable("sid") String sid); + @ApiOperation("app详情") + @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/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java index 45e10366fb..a8ebc7b856 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/ScmVehrebateCheckapplyFeignFallback.java @@ -77,6 +77,11 @@ public class ScmVehrebateCheckapplyFeignFallback implements ScmVehrebateCheckapp return rb.setMsg("接口anrui-scm/scmvehrebatecheckapply/fetchDetailsBySid无法访问"); } + @Override + public ResultBean appDetail(String sid) { + return null; + } + @Override public ResultBean createPdf(String vehCheckSid, String userName) { return null; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java index b2fd3c5515..0f09ac63d4 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeign.java @@ -76,4 +76,9 @@ public interface ScmVehrebateCheckapplydetailFeign { @GetMapping("/vehRebateCheckDetails/{sid}") @ResponseBody public ResultBean> vehRebateCheckDetails(@PathVariable("sid") String sid); + + @ApiOperation("app查询明细") + @GetMapping("/appMx/{sid}") + @ResponseBody + ResultBean> appMx(@PathVariable("sid") String sid); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java index 2c69e2bb94..d3a8f9fec1 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailFeignFallback.java @@ -69,4 +69,9 @@ public class ScmVehrebateCheckapplydetailFeignFallback implements ScmVehrebateCh public ResultBean> vehRebateCheckDetails(String sid) { return null; } + + @Override + public ResultBean> appMx(String sid) { + return null; + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java index 9a3f636b60..3587982c56 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyRest.java @@ -101,6 +101,11 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl return scmSpecialrebateCheckapplyService.fetchDetailsVoBySid(sid); } + @Override + public ResultBean appDetail(String sid) { + return scmSpecialrebateCheckapplyService.appDetail(sid); + } + @Override public ResultBean createPdf(String specialCheckSid, String userName) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java index 861eca8bbd..4f1f8a1684 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java @@ -63,6 +63,10 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.flow.SubmitScmSpecialReb import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDto; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplyDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapply; import com.yxt.anrui.scm.biz.scmspecialrebate.ScmSpecialRebateService; import com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailService; import com.yxt.anrui.scm.biz.scmvehrebatewithapply.ScmVehRebateWithApplyService; @@ -1162,4 +1166,32 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService appDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppSpecialrebateCheckapplyDetailsVo appSpecialrebateCheckapplyDetailsVo = new AppSpecialrebateCheckapplyDetailsVo(); + ScmSpecialrebateCheckapply scmSpecialrebateCheckapply = fetchBySid(sid); + appSpecialrebateCheckapplyDetailsVo.setSid(sid); + appSpecialrebateCheckapplyDetailsVo.setBillNo(scmSpecialrebateCheckapply.getBillNo()); + appSpecialrebateCheckapplyDetailsVo.setPublishInfo(scmSpecialrebateCheckapply.getCreateOrgName() + "-" + scmSpecialrebateCheckapply.getDeptName()); + appSpecialrebateCheckapplyDetailsVo.setCheckApply(scmSpecialrebateCheckapply.getCheckApply()); + appSpecialrebateCheckapplyDetailsVo.setCreateByName(scmSpecialrebateCheckapply.getCreateByName()); + appSpecialrebateCheckapplyDetailsVo.setCreateTime(DateUtil.formatDate(scmSpecialrebateCheckapply.getCreateTime())); + appSpecialrebateCheckapplyDetailsVo.setRemarks(scmSpecialrebateCheckapply.getRemarks()); + appSpecialrebateCheckapplyDetailsVo.setProcInsId(scmSpecialrebateCheckapply.getProcInstId()); + appSpecialrebateCheckapplyDetailsVo.setTaskId(scmSpecialrebateCheckapply.getTaskId()); + List when = scmSpecialrebateCheckapplydetailService.fetchByMainSid(sid); + List last = scmSpecialrebateCheckapplydetailService.fetchByMainSid(sid); + for (AppSpecialrebateCheckapplydetailDetailsVo appSpecialrebateCheckapplydetailDetailsVo : when) { + List type = scmSpecialrebateCheckapplydetailService.fetchByMainSidType(sid,appSpecialrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appSpecialrebateCheckapplydetailDetailsVo.getBrandName()); + appSpecialrebateCheckapplydetailDetailsVo.setDetails(type); + } + for (AppSpecialrebateCheckapplydetailDetailsVo appSpecialrebateCheckapplydetailDetailsVo : last) { + List date = scmSpecialrebateCheckapplydetailService.fetchByMainSidDate(sid,appSpecialrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appSpecialrebateCheckapplydetailDetailsVo.getBrandName()); + appSpecialrebateCheckapplydetailDetailsVo.setDetails(date); + } + appSpecialrebateCheckapplyDetailsVo.setScmWhenSpecialrebateCheckapplydetailDetails(when); + appSpecialrebateCheckapplyDetailsVo.setScmLastSpecialrebateCheckapplydetailDetails(last); + return rb.success().setData(appSpecialrebateCheckapplyDetailsVo); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java index 3805016a05..243db46cbe 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.java @@ -27,9 +27,12 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailssVo; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailDetailsVo; 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.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo; @@ -49,4 +52,12 @@ public interface ScmSpecialrebateCheckapplydetailMapper extends BaseMapper selByMainSid(String sid); List fetchBySpecialRebateSid(String mainSid); + + List fetchByMainSid(String sid); + + List fetchByMainSidType(@Param("sid") String sid, @Param("purchaseSystemName") String purchaseSystemName, @Param("brandName") String brandName); + + List fetchByMainSidDate(@Param("sid") String sid,@Param("purchaseSystemName") String purchaseSystemName,@Param("brandName") String brandName); + + ScmSpecialRebateDetailsVo appMx(String s); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml index 360dacbd7e..29c507bbec 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml @@ -59,6 +59,83 @@ + + + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java index 913a2d8e58..4b9bba733c 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailRest.java @@ -59,4 +59,9 @@ public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateChe public ResultBean> specialRebateCheckDetails(String sid) { return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid); } + + @Override + public ResultBean> appMx(String sid) { + return scmSpecialrebateCheckapplydetailService.appMx(sid); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java index b88f24e1f2..6b1846ea21 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailService.java @@ -27,6 +27,8 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail; import cn.hutool.core.bean.BeanUtil; import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailssVo; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.core.result.ResultBean; import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetail; @@ -91,4 +93,29 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService< } return rb.success().setData(scmSpecialRebateDetailsVos); } + + public List fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } + + public List fetchByMainSidType(String sid, String purchaseSystemName, String brandName) { + return baseMapper.fetchByMainSidType(sid,purchaseSystemName,brandName); + } + + public List fetchByMainSidDate(String sid, String purchaseSystemName, String brandName) { + return baseMapper.fetchByMainSidDate(sid,purchaseSystemName,brandName); + } + + public ResultBean> appMx(String sid) { + ResultBean rb = ResultBean.fireFail(); + List scmSpecialRebateDetailsVos = new ArrayList<>(); + String[] sids = sid.split(","); + for (String s : sids) { + ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = baseMapper.appMx(s); + scmSpecialRebateDetailsVo.setWithholdCost(scmSpecialRebateDetailsVo.getExpectItureCost().add(scmSpecialRebateDetailsVo.getExpectTreatCost()).add(scmSpecialRebateDetailsVo.getExpectSuppCost())); + scmSpecialRebateDetailsVo.setMoney(scmSpecialRebateDetailsVo.getOnceItureCost().add(scmSpecialRebateDetailsVo.getOnceTreatCost()).add(scmSpecialRebateDetailsVo.getOnceSuppCost()).add(scmSpecialRebateDetailsVo.getSecondItureCost()).add(scmSpecialRebateDetailsVo.getSecondTreatCost()).add(scmSpecialRebateDetailsVo.getSecondSuppCost()).toString()); + scmSpecialRebateDetailsVos.add(scmSpecialRebateDetailsVo); + } + return rb.success().setData(scmSpecialRebateDetailsVos); + } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java index 0059336525..f9ebf1209f 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java @@ -111,6 +111,11 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign { return scmVehrebateCheckapplyService.fetchDetailsBySid(sid); } + @Override + public ResultBean appDetail(String sid) { + return scmVehrebateCheckapplyService.appDetail(sid); + } + @Override public ResultBean createPdf(String vehCheckSid, String userName) { ResultBean rb = ResultBean.fireFail(); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java index 7f46040a65..46e3b61a83 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyService.java @@ -114,7 +114,7 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService appDetail(String sid) { + ResultBean rb = ResultBean.fireFail(); + AppVehrebateCheckapplyDetailsVo appVehrebateCheckapplyDetailsVo = new AppVehrebateCheckapplyDetailsVo(); + ScmVehrebateCheckapply scmVehrebateCheckapply = fetchBySid(sid); + appVehrebateCheckapplyDetailsVo.setSid(sid); + appVehrebateCheckapplyDetailsVo.setBillNo(scmVehrebateCheckapply.getBillNo()); + appVehrebateCheckapplyDetailsVo.setPublishInfo(scmVehrebateCheckapply.getCreateOrgName() + "-" + scmVehrebateCheckapply.getDeptName()); + appVehrebateCheckapplyDetailsVo.setCheckApply(scmVehrebateCheckapply.getCheckApply()); + appVehrebateCheckapplyDetailsVo.setCreateByName(scmVehrebateCheckapply.getCreateByName()); + appVehrebateCheckapplyDetailsVo.setCreateTime(DateUtil.formatDate(scmVehrebateCheckapply.getCreateTime())); + appVehrebateCheckapplyDetailsVo.setRemarks(scmVehrebateCheckapply.getRemarks()); + appVehrebateCheckapplyDetailsVo.setProcInsId(scmVehrebateCheckapply.getProcInstId()); + appVehrebateCheckapplyDetailsVo.setTaskId(scmVehrebateCheckapply.getTaskId()); + List when = scmVehrebateCheckapplydetailService.fetchByMainSid(sid); + List last = scmVehrebateCheckapplydetailService.fetchByMainSid(sid); + for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : when) { + List type = scmVehrebateCheckapplydetailService.fetchByMainSidType(sid,appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appVehrebateCheckapplydetailDetailsVo.getBrandName()); + appVehrebateCheckapplydetailDetailsVo.setDetails(type); + } + for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : last) { + List date = scmVehrebateCheckapplydetailService.fetchByMainSidDate(sid,appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appVehrebateCheckapplydetailDetailsVo.getBrandName()); + appVehrebateCheckapplydetailDetailsVo.setDetails(date); + } + appVehrebateCheckapplyDetailsVo.setScmWhenVehrebateCheckapplydetailDetails(when); + appVehrebateCheckapplyDetailsVo.setScmLastVehrebateCheckapplydetailDetails(last); + return rb.success().setData(appVehrebateCheckapplyDetailsVo); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java index 3b1ae617fb..e8e347ec94 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.java @@ -30,6 +30,8 @@ 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.scmvehrebate.ScmVehRebateDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; @@ -74,4 +76,13 @@ public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper selByVehRebteSid(String mainSid); + + List fetchByMainSid(String sid); + + List fetchByMainSidType(@Param("sid") String sid,@Param("purchaseSystemName") String purchaseSystemName,@Param("brandName") String brandName); + + List fetchByMainSidDate(@Param("sid") String sid,@Param("purchaseSystemName") String purchaseSystemName,@Param("brandName") String brandName); + + @Select("select * from scm_vehrebate_checkapplydetail where vehRebateSid = #{s}") + ScmVehRebateDetailsVo selByVehRebteSidNew(String s); } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml index 14bd00dc9c..a3e2c945eb 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailMapper.xml @@ -67,4 +67,65 @@ from scm_vehrebate_checkapplydetail where mainSid = #{sid} + + + + + + \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java index 24e56cdd30..ea8f910f47 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailRest.java @@ -79,4 +79,9 @@ public class ScmVehrebateCheckapplydetailRest implements ScmVehrebateCheckapplyd public ResultBean> vehRebateCheckDetails(String sid) { return scmVehrebateCheckapplydetailService.vehRebateCheckDetails(sid); } + + @Override + public ResultBean> appMx(String sid) { + return scmVehrebateCheckapplydetailService.appMx(sid); + } } diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java index e582a8cf80..12cb4bc269 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailService.java @@ -30,6 +30,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo; +import com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -95,4 +97,29 @@ public class ScmVehrebateCheckapplydetailService extends MybatisBaseService fetchByMainSid(String sid) { + return baseMapper.fetchByMainSid(sid); + } + + public List fetchByMainSidType(String sid, String purchaseSystemName, String brandName) { + return baseMapper.fetchByMainSidType(sid,purchaseSystemName,brandName); + } + + public List fetchByMainSidDate(String sid, String purchaseSystemName, String brandName) { + return baseMapper.fetchByMainSidDate(sid,purchaseSystemName,brandName); + } + + public ResultBean> appMx(String sid) { + ResultBean rb = ResultBean.fireFail(); + List scmVehRebateDetailsVos = new ArrayList<>(); + String[] split = sid.split(","); + for (String s : split) { + ScmVehRebateDetailsVo scmVehRebateDetailsVo = baseMapper.selByVehRebteSidNew(s); + scmVehRebateDetailsVo.setWithholdCost(scmVehRebateDetailsVo.getExpectTreatCost().add(scmVehRebateDetailsVo.getExpectSuppCost())); + scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString()); + scmVehRebateDetailsVos.add(scmVehRebateDetailsVo); + } + return rb.success().setData(scmVehRebateDetailsVos); + } } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java index 4bc0f486b3..5ee81eb52c 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyDetailsVo.java @@ -52,27 +52,25 @@ import java.util.List; @ApiModel(value = "专项返利核对申请表 视图数据详情", description = "专项返利核对申请表 视图数据详情") public class AppSpecialrebateCheckapplyDetailsVo implements Vo { - private String sid; // sid + private String sid; @ApiModelProperty("单据编号") private String billNo; - @ApiModelProperty("创建组织名称") - private String createOrgName; + @ApiModelProperty("分公司-部门") + private String publishInfo; @ApiModelProperty("核对申请标题") private String checkApply; - @ApiModelProperty("申请部门名称") - private String deptName; @ApiModelProperty("创建人姓名") private String createByName; - @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") @ApiModelProperty("创建日期") private Date createTime; @ApiModelProperty("备注") private String remarks; @ApiModelProperty("流程实例的sid") - private String procInsId; // 流程实例的sid + private String procInsId; @ApiModelProperty("taskId") - private String taskId; // taskId + private String taskId; @ApiModelProperty("按返利类型统计") private List scmWhenSpecialrebateCheckapplydetailDetails; @ApiModelProperty("按预提年月统计") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java index 8861bb6d90..900de5e0e4 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailsVo.java @@ -26,6 +26,7 @@ package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply; +import com.yxt.anrui.terminal.api.supplychain.vehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo; import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -47,36 +48,26 @@ import java.util.List; * @since 1.0 */ @Data -@ApiModel(value = "专项返利核对申请表_返利列表 视图数据详情", description = "专项返利核对申请表_返利列表 视图数据详情") public class AppSpecialrebateCheckapplydetailDetailsVo implements Vo { - private String sid; // sid + @ApiModelProperty("采购系统名称+品牌名称+本月上传返利核对及调整金额合计") + private String title; + @ApiModelProperty("数量合计") + private String numTotal; + @ApiModelProperty("预提金额合计") + private String withRebateTotal; + @ApiModelProperty("其中预提费用合计") + private String withholdCostTotal; + @ApiModelProperty("上传金额合计") + private String uploadMoneyTotal; + @ApiModelProperty("其中费用合计") + private String moneyTotal; + @ApiModelProperty("其中待确认金额合计") + private String stayDetermineMoneyTotal; + @ApiModelProperty("返利调整金额合计") + private String adjustmentMoneyTotal; + @ApiModelProperty("其中费用调整金额合计") + private String fyAdjustmentMoneyTotal; - @ApiModelProperty("采购系统名称") - private String purchaseSystemName; - @ApiModelProperty("品牌名称") - private String brandName; - @ApiModelProperty("预提日期") - private String withholdingDate; // 预提日期 - @ApiModelProperty("返利类型value") - private String rebateTypeValue; // 返利类型value - @ApiModelProperty("台数") - private String num; // 台数 - @ApiModelProperty("预提金额") - private String withRebate; // 预提金额 - @ApiModelProperty("其中预提费用") - private String withholdCost; - @ApiModelProperty("上传金额") - private String uploadMoney; // 上传金额 - @ApiModelProperty("待确定金额") - private String stayDetermineMoney; // 待确定金额 - @ApiModelProperty("费用") - private String money; - @ApiModelProperty("调整金额") - private String adjustmentMoney; // 调整金额 - @ApiModelProperty("费用调整金额") - private String fyAdjustmentMoney; - - @ApiModelProperty("专项返利sid") - private String specialRebateSid; // 专项返利sid + private List details; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailssVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailssVo.java new file mode 100644 index 0000000000..4b2c918921 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplydetailDetailssVo.java @@ -0,0 +1,74 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply; + + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +/** + * Project: anrui-scm(专项返利)
+ * File: ScmSpecialrebateCheckapplydetailVo.java
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo
+ * 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 AppSpecialrebateCheckapplydetailDetailssVo implements Vo { + + private String sid; + @ApiModelProperty("采购系统名称+品牌名称+返利类型+明细") + private String title; + @ApiModelProperty("返利类型") + private String rebateTypeValue; + @ApiModelProperty("预提年月") + private String withholdingDate; + @ApiModelProperty("数量") + private String num; + @ApiModelProperty("预提金额") + private String withRebate; + @ApiModelProperty("其中预提费用") + private String withholdCost; + @ApiModelProperty("上传金额") + private String uploadMoney; + @ApiModelProperty("其中费用") + private String money; + @ApiModelProperty("其中待确认金额") + private String stayDetermineMoney; + @ApiModelProperty("返利调整金额") + private String adjustmentMoney; + @ApiModelProperty("其中费用调整金额") + private String fyAdjustmentMoney; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java index cc2b69fd97..4fb6e60ef9 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyDetailsVo.java @@ -52,16 +52,14 @@ import java.util.List; @ApiModel(value = "单车返利核对申请表 视图数据详情", description = "单车返利核对申请表 视图数据详情") public class AppVehrebateCheckapplyDetailsVo implements Vo { - private String sid; // sid + private String sid; - @ApiModelProperty("创建组织名称") - private String createOrgName; @ApiModelProperty("单据编号") private String billNo; + @ApiModelProperty("分公司-部门") + private String publishInfo; @ApiModelProperty("核对申请标题") private String checkApply; - @ApiModelProperty("部门") - private String deptName; @ApiModelProperty("创建人姓名") private String createByName; @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8") diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java index 0ef485ca60..4b860b6cc2 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailsVo.java @@ -25,7 +25,6 @@ *********************************************************/ package com.yxt.anrui.terminal.api.supplychain.vehrebatecheckapply; - import com.yxt.common.core.vo.Vo; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -33,49 +32,27 @@ import lombok.Data; import java.util.List; -/** - * Project: anrui-scm(单车返利核对)
- * File: ScmVehrebateCheckapplydetailVo.java
- * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo
- * Description: 单车返利核对申请表_返利列表 视图数据对象.
- * Copyright: Copyright (c) 2011
- * Company: https://gitee.com/liuzp315
- * Makedate: 2022-08-29 16:01:01
- * - * @author liupopo - * @version 1.0 - * @since 1.0 - */ @Data -@ApiModel(value = "单车返利核对申请表_返利列表 视图数据详情", description = "单车返利核对申请表_返利列表 视图数据详情") public class AppVehrebateCheckapplydetailDetailsVo implements Vo { - private String sid; // sid + @ApiModelProperty("采购系统名称+品牌名称+本月上传返利核对及调整金额合计") + private String title; + @ApiModelProperty("数量合计") + private String numTotal; + @ApiModelProperty("预提金额合计") + private String withRebateTotal; + @ApiModelProperty("其中预提费用合计") + private String withholdCostTotal; + @ApiModelProperty("上传金额合计") + private String uploadMoneyTotal; + @ApiModelProperty("其中费用合计") + private String moneyTotal; + @ApiModelProperty("其中待确认金额合计") + private String stayDetermineMoneyTotal; + @ApiModelProperty("返利调整金额合计") + private String adjustmentMoneyTotal; + @ApiModelProperty("其中费用调整金额合计") + private String fyAdjustmentMoneyTotal; - @ApiModelProperty("品牌名称") - private String brandName; - @ApiModelProperty("采购系统") - private String purchaseSystemName; - @ApiModelProperty("返利类型value") - private String rebateTypeValue; - @ApiModelProperty("预提日期") - private String withholdingDate; - @ApiModelProperty("数量") - private String num; - @ApiModelProperty("预提金额") - private String withRebate; - @ApiModelProperty("其中预提费用") - private String withholdCost; - @ApiModelProperty("上传金额") - private String uploadMoney; - @ApiModelProperty("待确定金额") - private String stayDetermineMoney; - @ApiModelProperty("费用") - private String money; - @ApiModelProperty("调整金额") - private String adjustmentMoney; - @ApiModelProperty("费用调整金额") - private String fyAdjustmentMoney; - @ApiModelProperty("单车返利sid") - private String vehRebateSid; + private List details; } \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailssVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailssVo.java new file mode 100644 index 0000000000..50474ac276 --- /dev/null +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/vehrebatecheckapply/AppVehrebateCheckapplydetailDetailssVo.java @@ -0,0 +1,58 @@ +/********************************************************* + ********************************************************* + ******************** ******************* + ************* ************ + ******* _oo0oo_ ******* + *** o8888888o *** + * 88" . "88 * + * (| -_- |) * + * 0\ = /0 * + * ___/`---'\___ * + * .' \\| |// '. * + * / \\||| : |||// \ * + * / _||||| -:- |||||- \ * + * | | \\\ - /// | | * + * | \_| ''\---/'' |_/ | * + * \ .-\__ '-' ___/-. / * + * ___'. .' /--.--\ `. .'___ * + * ."" '< `.___\_<|>_/___.' >' "". * + * | | : `- \`.;`\ _ /`;.`/ - ` : | | * + * \ \ `_. \_ __\ /__ _/ .-` / / * + * =====`-.____`.___ \_____/___.-`___.-'===== * + * `=---=' * + * ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ * + *********__佛祖保佑__永无BUG__验收通过__钞票多多__********* + *********************************************************/ +package com.yxt.anrui.terminal.api.supplychain.vehrebatecheckapply; + +import com.yxt.common.core.vo.Vo; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +@Data +public class AppVehrebateCheckapplydetailDetailssVo implements Vo { + + private String sid; + @ApiModelProperty("采购系统名称+品牌名称+返利类型+明细") + private String title; + @ApiModelProperty("返利类型") + private String rebateTypeValue; + @ApiModelProperty("预提年月") + private String withholdingDate; + @ApiModelProperty("数量") + private String num; + @ApiModelProperty("预提金额") + private String withRebate; + @ApiModelProperty("其中预提费用") + private String withholdCost; + @ApiModelProperty("上传金额") + private String uploadMoney; + @ApiModelProperty("其中费用") + private String money; + @ApiModelProperty("其中待确认金额") + private String stayDetermineMoney; + @ApiModelProperty("返利调整金额") + private String adjustmentMoney; + @ApiModelProperty("其中费用调整金额") + private String fyAdjustmentMoney; +} \ No newline at end of file diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyService.java index daea6da054..8fe72b6ba5 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/specialrebatecheckapply/AppSpecialrebateCheckapplyService.java @@ -47,6 +47,7 @@ import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.A import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowDto; import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowQuery; import com.yxt.anrui.terminal.api.supplychain.specialrebatecheckapply.flowable.AppFlowTaskQuery; +import com.yxt.anrui.terminal.api.supplychain.vehrebatecheckapply.AppVehrebateCheckapplyDetailsVo; import com.yxt.common.core.result.ResultBean; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -72,25 +73,16 @@ public class AppSpecialrebateCheckapplyService { public ResultBean fetchDetailsBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - ScmSpecialrebateCheckapplyDetailsVo data = scmSpecialrebateCheckapplyFeign.fetchDetailsBySid(sid).getData(); AppSpecialrebateCheckapplyDetailsVo appSpecialrebateCheckapplyDetailsVo = new AppSpecialrebateCheckapplyDetailsVo(); - appSpecialrebateCheckapplyDetailsVo.setProcInsId(data.getProcInstId()); + com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplyDetailsVo data = scmSpecialrebateCheckapplyFeign.appDetail(sid).getData(); BeanUtil.copyProperties(data,appSpecialrebateCheckapplyDetailsVo); - List when = appSpecialrebateCheckapplyDetailsVo.getScmWhenSpecialrebateCheckapplydetailDetails(); - List last = appSpecialrebateCheckapplyDetailsVo.getScmLastSpecialrebateCheckapplydetailDetails(); - for (AppSpecialrebateCheckapplydetailDetailsVo specialrebateCheckapplydetailDetailsVo : when) { - specialrebateCheckapplydetailDetailsVo.setSid(specialrebateCheckapplydetailDetailsVo.getSpecialRebateSid()); - } - for (AppSpecialrebateCheckapplydetailDetailsVo specialrebateCheckapplydetailDetailsVo : last) { - specialrebateCheckapplydetailDetailsVo.setSid(specialrebateCheckapplydetailDetailsVo.getSpecialRebateSid()); - } return rb.success().setData(appSpecialrebateCheckapplyDetailsVo); } public ResultBean> specialRebateCheckDetails(String sid) { ResultBean rb = ResultBean.fireFail(); List appSpecialRebateDetailsVos = new ArrayList<>(); - List data = scmSpecialrebateCheckapplydetailFeign.specialRebateCheckDetails(sid).getData(); + List data = scmSpecialrebateCheckapplydetailFeign.appMx(sid).getData(); for (ScmSpecialRebateDetailsVo datum : data) { AppSpecialRebateDetailsVo appSpecialRebateDetailsVo = new AppSpecialRebateDetailsVo(); BeanUtil.copyProperties(datum,appSpecialRebateDetailsVo); diff --git a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyService.java b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyService.java index 036c269464..4c52e84340 100644 --- a/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyService.java +++ b/anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/supplychain/vehrebatecheckapply/AppVehrebateCheckapplyService.java @@ -68,25 +68,16 @@ public class AppVehrebateCheckapplyService { public ResultBean fetchDetailsBySid(String sid) { ResultBean rb = ResultBean.fireFail(); - ScmVehrebateCheckapplyDetailsVo data = scmVehrebateCheckapplyFeign.fetchDetailsBySid(sid).getData(); AppVehrebateCheckapplyDetailsVo appVehrebateCheckapplyDetailsVo = new AppVehrebateCheckapplyDetailsVo(); - appVehrebateCheckapplyDetailsVo.setProcInsId(data.getProcInstId()); + com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplyDetailsVo data = scmVehrebateCheckapplyFeign.appDetail(sid).getData(); BeanUtil.copyProperties(data,appVehrebateCheckapplyDetailsVo); - List when = appVehrebateCheckapplyDetailsVo.getScmWhenVehrebateCheckapplydetailDetails(); - List last = appVehrebateCheckapplyDetailsVo.getScmLastVehrebateCheckapplydetailDetails(); - for (AppVehrebateCheckapplydetailDetailsVo vehrebateCheckapplydetailDetailsVo : when) { - vehrebateCheckapplydetailDetailsVo.setSid(vehrebateCheckapplydetailDetailsVo.getVehRebateSid()); - } - for (AppVehrebateCheckapplydetailDetailsVo vehrebateCheckapplydetailDetailsVo : last) { - vehrebateCheckapplydetailDetailsVo.setSid(vehrebateCheckapplydetailDetailsVo.getVehRebateSid()); - } return rb.success().setData(appVehrebateCheckapplyDetailsVo); } public ResultBean> vehRebateCheckDetails(String sid) { ResultBean rb = ResultBean.fireFail(); List appVehRebateDetailsVos = new ArrayList<>(); - List data = scmVehrebateCheckapplydetailFeign.vehRebateCheckDetails(sid).getData(); + List data = scmVehrebateCheckapplydetailFeign.appMx(sid).getData(); for (ScmVehRebateDetailsVo datum : data) { AppVehRebateDetailsVo appVehRebateDetailsVo = new AppVehRebateDetailsVo(); BeanUtil.copyProperties(datum,appVehRebateDetailsVo);