Merge remote-tracking branch 'origin/master'

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(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapply.ScmSpecialrebateCheckapplyVo <br/>
+ * Description: 专项返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @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<AppSpecialrebateCheckapplydetailDetailsVo> scmWhenSpecialrebateCheckapplydetailDetails;
+    @ApiModelProperty("按预提年月统计")
+    private List<AppSpecialrebateCheckapplydetailDetailsVo> scmLastSpecialrebateCheckapplydetailDetails;
+}

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(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo <br/>
+ * Description: 专项返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @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<AppSpecialrebateCheckapplydetailDetailssVo> details;
+}

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(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo <br/>
+ * Description: 专项返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @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;
+}

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<ScmSpecialrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("app详情")
+    @GetMapping("/appDetail/{sid}")
+    @ResponseBody
+    ResultBean<AppSpecialrebateCheckapplyDetailsVo> 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);
-
 }

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<AppSpecialrebateCheckapplyDetailsVo> appDetail(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<String> createPdf(String specialCheckSid, String userName) {
 		return null;

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<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(@PathVariable("sid") String sid);
+
+    @ApiOperation("app查询明细")
+    @GetMapping("/appMx/{sid}")
+    @ResponseBody
+    ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(@PathVariable("sid") String sid);
 }

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<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
+		return null;
+	}
 }

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(单车返利核对) <br/>
+ * File: ScmVehrebateCheckapplyVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapply.ScmVehrebateCheckapplyVo <br/>
+ * Description: 单车返利核对申请表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-08-29 16:01:01 <br/>
+ *
+ * @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<AppVehrebateCheckapplydetailDetailsVo> scmWhenVehrebateCheckapplydetailDetails;
+    @ApiModelProperty("按预提年月统计")
+    private List<AppVehrebateCheckapplydetailDetailsVo> scmLastVehrebateCheckapplydetailDetails;
+}

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<AppVehrebateCheckapplydetailDetailssVo> details;
+}

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;
+}

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<ScmVehrebateCheckapplyDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
 
+    @ApiOperation("app详情")
+    @GetMapping("/appDetail/{sid}")
+    @ResponseBody
+    ResultBean<AppVehrebateCheckapplyDetailsVo> appDetail(@PathVariable("sid") String sid);
+
     @ApiOperation("生成单车返利核对pdf")
     @PostMapping("/createPdf")
     @ResponseBody

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<AppVehrebateCheckapplyDetailsVo> appDetail(String sid) {
+		return null;
+	}
+
 	@Override
 	public ResultBean<String> createPdf(String vehCheckSid, String userName) {
 		return null;

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<List<ScmVehRebateDetailsVo>> vehRebateCheckDetails(@PathVariable("sid") String sid);
+
+    @ApiOperation("app查询明细")
+    @GetMapping("/appMx/{sid}")
+    @ResponseBody
+    ResultBean<List<ScmVehRebateDetailsVo>> appMx(@PathVariable("sid") String sid);
 }

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<List<ScmVehRebateDetailsVo>> vehRebateCheckDetails(String sid) {
 		return null;
 	}
+
+	@Override
+	public ResultBean<List<ScmVehRebateDetailsVo>> appMx(String sid) {
+		return null;
+	}
 }

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<AppSpecialrebateCheckapplyDetailsVo> appDetail(String sid) {
+        return scmSpecialrebateCheckapplyService.appDetail(sid);
+    }
+
     @Override
     public ResultBean<String> createPdf(String specialCheckSid, String userName) {
         ResultBean rb = ResultBean.fireFail();

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<ScmSpe
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
         return "/template/" + dateStr + "/" + pdfName;
     }
+
+    public ResultBean<AppSpecialrebateCheckapplyDetailsVo> 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<AppSpecialrebateCheckapplydetailDetailsVo> when = scmSpecialrebateCheckapplydetailService.fetchByMainSid(sid);
+        List<AppSpecialrebateCheckapplydetailDetailsVo> last = scmSpecialrebateCheckapplydetailService.fetchByMainSid(sid);
+        for (AppSpecialrebateCheckapplydetailDetailsVo appSpecialrebateCheckapplydetailDetailsVo : when) {
+            List<AppSpecialrebateCheckapplydetailDetailssVo> type = scmSpecialrebateCheckapplydetailService.fetchByMainSidType(sid,appSpecialrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appSpecialrebateCheckapplydetailDetailsVo.getBrandName());
+            appSpecialrebateCheckapplydetailDetailsVo.setDetails(type);
+        }
+        for (AppSpecialrebateCheckapplydetailDetailsVo appSpecialrebateCheckapplydetailDetailsVo : last) {
+            List<AppSpecialrebateCheckapplydetailDetailssVo> date = scmSpecialrebateCheckapplydetailService.fetchByMainSidDate(sid,appSpecialrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appSpecialrebateCheckapplydetailDetailsVo.getBrandName());
+            appSpecialrebateCheckapplydetailDetailsVo.setDetails(date);
+        }
+        appSpecialrebateCheckapplyDetailsVo.setScmWhenSpecialrebateCheckapplydetailDetails(when);
+        appSpecialrebateCheckapplyDetailsVo.setScmLastSpecialrebateCheckapplydetailDetails(last);
+        return rb.success().setData(appSpecialrebateCheckapplyDetailsVo);
+    }
 }

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<ScmSp
     List<ScmSpecialrebateCheckapplydetailVo> selByMainSid(String sid);
 
     List<ScmSpecialRebateDetailsVo> fetchBySpecialRebateSid(String mainSid);
+
+    List<AppSpecialrebateCheckapplydetailDetailsVo> fetchByMainSid(String sid);
+
+    List<AppSpecialrebateCheckapplydetailDetailssVo> fetchByMainSidType(@Param("sid") String sid, @Param("purchaseSystemName") String purchaseSystemName, @Param("brandName") String brandName);
+
+    List<AppSpecialrebateCheckapplydetailDetailssVo> fetchByMainSidDate(@Param("sid") String sid,@Param("purchaseSystemName") String purchaseSystemName,@Param("brandName") String brandName);
+
+    ScmSpecialRebateDetailsVo appMx(String s);
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailMapper.xml

@@ -59,6 +59,83 @@
 
     <select id="selByMainSid"
             resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo">
-        select *,expectItureCost + expectTreatCost + expectSuppCost as withholdCost from scm_specialrebate_checkapplydetail where mainSid = #{sid}
+        select *, expectItureCost + expectTreatCost + expectSuppCost as withholdCost
+        from scm_specialrebate_checkapplydetail
+        where mainSid = #{sid}
+    </select>
+
+    <select id="fetchByMainSid"
+            resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailsVo">
+        SELECT ssc.purchaseSystemName,
+               ssc.brandName,
+               CONCAT(ssc.purchaseSystemName, ssc.brandName, '本月上传返利核对及调整金额合计')       title,
+               COUNT(*)                                                               numTotal,
+               SUM(ssc.estimateRebate)                                                withRebateTotal,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS withholdCostTotal,
+               SUM(ssc.uploadMoney)                                                   uploadMoneyTotal,
+               SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
+                   ssc.secondTreatCost + ssc.secondSuppCost)                       AS moneyTotal,
+               SUM(ssc.stayDetermineMoney)                                            stayDetermineMoneyTotal,
+               SUM(ssc.adjustmentMoney)                                               adjustmentMoneyTotal,
+               SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
+                   ssc.secondTreatCost + ssc.secondSuppCost) -
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS fyAdjustmentMoneyTotal
+        FROM scm_specialrebate_checkapplydetail ssc
+        WHERE ssc.mainSid = #{sid}
+        GROUP BY ssc.brandSid, ssc.purchaseSystemSid
+    </select>
+
+    <select id="fetchByMainSidType"
+            resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailssVo">
+        SELECT GROUP_CONCAT(ssc.specialRebateSid)                                       sid,
+               CONCAT(ssc.purchaseSystemName, ssc.brandName, ssc.rebateTypeValue, '明细') title,
+               ssc.rebateTypeValue,
+               COUNT(*)                                                                 num,
+               SUM(ssc.estimateRebate)                                                  withRebate,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS   withholdCost,
+               SUM(ssc.uploadMoney)                                                     uploadMoney,
+               SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
+                   ssc.secondTreatCost + ssc.secondSuppCost)                       AS   money,
+               SUM(ssc.stayDetermineMoney)                                              stayDetermineMoney,
+               SUM(ssc.adjustmentMoney)                                                 adjustmentMoney,
+               SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
+                   ssc.secondTreatCost + ssc.secondSuppCost) -
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS   fyAdjustmentMoney
+        FROM scm_specialrebate_checkapplydetail ssc
+        WHERE ssc.mainSid = #{sid}
+          AND ssc.purchaseSystemName = #{purchaseSystemName}
+          AND ssc.brandName = #{brandName}
+        GROUP BY ssc.rebateTypeKey
+    </select>
+
+    <select id="fetchByMainSidDate"
+            resultType="com.yxt.anrui.scm.api.scmspecialrebatecheckapply.AppSpecialrebateCheckapplydetailDetailssVo">
+        SELECT GROUP_CONCAT(ssc.specialRebateSid)                                         sid,
+               CONCAT(ssc.purchaseSystemName, ssc.brandName, ssc.withholdingDate, '预提明细') title,
+               ssc.withholdingDate,
+               COUNT(*)                                                                   num,
+               SUM(ssc.estimateRebate)                                                    withRebate,
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS     withholdCost,
+               SUM(ssc.uploadMoney)                                                       uploadMoney,
+               SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
+                   ssc.secondTreatCost + ssc.secondSuppCost)                       AS     money,
+               SUM(ssc.stayDetermineMoney)                                                stayDetermineMoney,
+               SUM(ssc.adjustmentMoney)                                                   adjustmentMoney,
+               SUM(ssc.onceItureCost + ssc.onceTreatCost + ssc.onceSuppCost + ssc.secondItureCost +
+                   ssc.secondTreatCost + ssc.secondSuppCost) -
+               SUM(ssc.expectItureCost + ssc.expectTreatCost + ssc.expectSuppCost) AS     fyAdjustmentMoney
+        FROM scm_specialrebate_checkapplydetail ssc
+        WHERE ssc.mainSid = #{sid}
+          AND ssc.purchaseSystemName = #{purchaseSystemName}
+          AND ssc.brandName = #{brandName}
+        GROUP BY ssc.withholdingDate
+    </select>
+
+    <select id="appMx" resultType="com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo">
+        SELECT sc.createOrgName, sd.*
+        FROM scm_specialrebate_checkapplydetail sd
+                 LEFT JOIN scm_specialrebate_checkapply sc
+                           ON sd.mainSid = sc.sid
+        WHERE sd.specialRebateSid = #{s}
     </select>
 </mapper>

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<List<ScmSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
 		return scmSpecialrebateCheckapplydetailService.specialRebateCheckDetails(sid);
 	}
+
+	@Override
+	public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
+		return scmSpecialrebateCheckapplydetailService.appMx(sid);
+	}
 }

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<AppSpecialrebateCheckapplydetailDetailsVo> fetchByMainSid(String sid) {
+        return baseMapper.fetchByMainSid(sid);
+    }
+
+    public List<AppSpecialrebateCheckapplydetailDetailssVo> fetchByMainSidType(String sid, String purchaseSystemName, String brandName) {
+        return baseMapper.fetchByMainSidType(sid,purchaseSystemName,brandName);
+    }
+
+    public List<AppSpecialrebateCheckapplydetailDetailssVo> fetchByMainSidDate(String sid, String purchaseSystemName, String brandName) {
+        return baseMapper.fetchByMainSidDate(sid,purchaseSystemName,brandName);
+    }
+
+    public ResultBean<List<ScmSpecialRebateDetailsVo>> appMx(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<ScmSpecialRebateDetailsVo> 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);
+    }
 }

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<AppVehrebateCheckapplyDetailsVo> appDetail(String sid) {
+        return scmVehrebateCheckapplyService.appDetail(sid);
+    }
+
     @Override
     public ResultBean<String> createPdf(String vehCheckSid, String userName) {
         ResultBean rb = ResultBean.fireFail();

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<ScmVehreba
     @Autowired
     private BusDeliveredApplyFeign busDeliveredApplyFeign;
     @Autowired
-    ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
+    private ScmVehrebateCheckapplydetailService scmVehrebateCheckapplydetailService;
     @Autowired
     private ScmVehRebateService scmVehRebateService;
     @Autowired
@@ -1080,4 +1080,32 @@ public class ScmVehrebateCheckapplyService extends MybatisBaseService<ScmVehreba
         WordUtils.doc2pdf(wordPath, targetPath, pdfName, userName);
         return "/template/" + dateStr + "/" + pdfName;
     }
+
+    public ResultBean<AppVehrebateCheckapplyDetailsVo> 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<AppVehrebateCheckapplydetailDetailsVo> when = scmVehrebateCheckapplydetailService.fetchByMainSid(sid);
+        List<AppVehrebateCheckapplydetailDetailsVo> last = scmVehrebateCheckapplydetailService.fetchByMainSid(sid);
+        for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : when) {
+            List<AppVehrebateCheckapplydetailDetailssVo> type = scmVehrebateCheckapplydetailService.fetchByMainSidType(sid,appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appVehrebateCheckapplydetailDetailsVo.getBrandName());
+            appVehrebateCheckapplydetailDetailsVo.setDetails(type);
+        }
+        for (AppVehrebateCheckapplydetailDetailsVo appVehrebateCheckapplydetailDetailsVo : last) {
+            List<AppVehrebateCheckapplydetailDetailssVo> date = scmVehrebateCheckapplydetailService.fetchByMainSidDate(sid,appVehrebateCheckapplydetailDetailsVo.getPurchaseSystemName(),appVehrebateCheckapplydetailDetailsVo.getBrandName());
+            appVehrebateCheckapplydetailDetailsVo.setDetails(date);
+        }
+        appVehrebateCheckapplyDetailsVo.setScmWhenVehrebateCheckapplydetailDetails(when);
+        appVehrebateCheckapplyDetailsVo.setScmLastVehrebateCheckapplydetailDetails(last);
+        return rb.success().setData(appVehrebateCheckapplyDetailsVo);
+    }
 }

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<ScmVehreb
 
     @Select("select * from scm_vehrebate_checkapplydetail where mainSid = #{mainSid}")
     List<ScmVehRebateDetailsVo> selByVehRebteSid(String mainSid);
+
+    List<AppVehrebateCheckapplydetailDetailsVo> fetchByMainSid(String sid);
+
+    List<AppVehrebateCheckapplydetailDetailssVo> fetchByMainSidType(@Param("sid") String sid,@Param("purchaseSystemName") String purchaseSystemName,@Param("brandName") String brandName);
+
+    List<AppVehrebateCheckapplydetailDetailssVo> 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);
 }

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}
     </select>
+
+    <select id="fetchByMainSid"
+            resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailsVo">
+        SELECT svc.purchaseSystemName,
+               svc.brandName,
+               CONCAT(svc.purchaseSystemName, svc.brandName, '本月上传返利核对及调整金额合计')                     title,
+               COUNT(*)                                                                             numTotal,
+               SUM(svc.estimateRebate)                                                              withRebateTotal,
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        withholdCostTotal,
+               SUM(svc.uploadMoney)                                                                 uploadMoneyTotal,
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) moneyTotal,
+               SUM(svc.stayDetermineMoney)                                                          stayDetermineMoneyTotal,
+               SUM(svc.adjustmentMoney)                                                             adjustmentMoneyTotal,
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        fyAdjustmentMoneyTotal
+        FROM scm_vehrebate_checkapplydetail svc
+        WHERE svc.mainSid = #{sid}
+        GROUP BY svc.brandSid, svc.purchaseSystemSid
+    </select>
+
+    <select id="fetchByMainSidType"
+            resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo">
+        SELECT GROUP_CONCAT(svc.vehRebateSid)                                                       sid,
+               CONCAT(svc.purchaseSystemName, svc.brandName, svc.rebateTypeValue, '明细')             title,
+               svc.rebateTypeValue,
+               COUNT(*)                                                                             num,
+               SUM(svc.estimateRebate)                                                              withRebate,
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        withholdCost,
+               SUM(svc.uploadMoney)                                                                 uploadMoney,
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money,
+               SUM(svc.stayDetermineMoney)                                                          stayDetermineMoney,
+               SUM(svc.adjustmentMoney)                                                             adjustmentMoney,
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        fyAdjustmentMoney
+        FROM scm_vehrebate_checkapplydetail svc
+        WHERE svc.mainSid = #{sid}
+          AND svc.purchaseSystemName = #{purchaseSystemName}
+          AND svc.brandName = #{brandName}
+        GROUP BY svc.rebateTypeKey
+    </select>
+
+    <select id="fetchByMainSidDate"
+            resultType="com.yxt.anrui.scm.api.scmvehrebatecheckapply.AppVehrebateCheckapplydetailDetailssVo">
+        SELECT GROUP_CONCAT(svc.vehRebateSid)                                                       sid,
+               CONCAT(svc.purchaseSystemName, svc.brandName, svc.withholdingDate, '预提明细')           title,
+               svc.withholdingDate,
+               COUNT(*)                                                                             num,
+               SUM(svc.estimateRebate)                                                              withRebate,
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        withholdCost,
+               SUM(svc.uploadMoney)                                                                 uploadMoney,
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) money,
+               SUM(svc.stayDetermineMoney)                                                          stayDetermineMoney,
+               SUM(svc.adjustmentMoney)                                                             adjustmentMoney,
+               SUM(svc.onceTreatCost + svc.onceSuppCost + svc.secondTreatCost + svc.secondSuppCost) -
+               SUM(svc.expectTreatCost + svc.expectSuppCost)                                        fyAdjustmentMoney
+        FROM scm_vehrebate_checkapplydetail svc
+        WHERE svc.mainSid = #{sid}
+          AND svc.purchaseSystemName = #{purchaseSystemName}
+          AND svc.brandName = #{brandName}
+        GROUP BY svc.withholdingDate
+    </select>
 </mapper>

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<List<ScmVehRebateDetailsVo>> vehRebateCheckDetails(String sid) {
         return scmVehrebateCheckapplydetailService.vehRebateCheckDetails(sid);
     }
+
+    @Override
+    public ResultBean<List<ScmVehRebateDetailsVo>> appMx(String sid) {
+        return scmVehrebateCheckapplydetailService.appMx(sid);
+    }
 }

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<ScmV
         }
         return rb.success().setData(scmVehRebateDetailsVos);
     }
+
+    public List<AppVehrebateCheckapplydetailDetailsVo> fetchByMainSid(String sid) {
+        return baseMapper.fetchByMainSid(sid);
+    }
+
+    public List<AppVehrebateCheckapplydetailDetailssVo> fetchByMainSidType(String sid, String purchaseSystemName, String brandName) {
+        return baseMapper.fetchByMainSidType(sid,purchaseSystemName,brandName);
+    }
+
+    public List<AppVehrebateCheckapplydetailDetailssVo> fetchByMainSidDate(String sid, String purchaseSystemName, String brandName) {
+        return baseMapper.fetchByMainSidDate(sid,purchaseSystemName,brandName);
+    }
+
+    public ResultBean<List<ScmVehRebateDetailsVo>> appMx(String sid) {
+        ResultBean rb = ResultBean.fireFail();
+        List<ScmVehRebateDetailsVo> 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);
+    }
 }

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<AppSpecialrebateCheckapplydetailDetailsVo> scmWhenSpecialrebateCheckapplydetailDetails;
     @ApiModelProperty("按预提年月统计")

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<AppSpecialrebateCheckapplydetailDetailssVo> details;
 }

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(专项返利) <br/>
+ * File: ScmSpecialrebateCheckapplydetailVo.java <br/>
+ * Class: com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailVo <br/>
+ * Description: 专项返利核对申请表_返利列表 视图数据对象. <br/>
+ * Copyright: Copyright (c) 2011 <br/>
+ * Company: https://gitee.com/liuzp315 <br/>
+ * Makedate: 2022-09-09 09:14:10 <br/>
+ *
+ * @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;
+}

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")

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(单车返利核对) <br/>
- * File: ScmVehrebateCheckapplydetailVo.java <br/>
- * Class: com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailVo <br/>
- * Description: 单车返利核对申请表_返利列表 视图数据对象. <br/>
- * Copyright: Copyright (c) 2011 <br/>
- * Company: https://gitee.com/liuzp315 <br/>
- * Makedate: 2022-08-29 16:01:01 <br/>
- *
- * @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<AppVehrebateCheckapplydetailDetailssVo> details;
 }

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;
+}

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<AppSpecialrebateCheckapplyDetailsVo> 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<AppSpecialrebateCheckapplydetailDetailsVo> when = appSpecialrebateCheckapplyDetailsVo.getScmWhenSpecialrebateCheckapplydetailDetails();
-        List<AppSpecialrebateCheckapplydetailDetailsVo> 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<List<AppSpecialRebateDetailsVo>> specialRebateCheckDetails(String sid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppSpecialRebateDetailsVo> appSpecialRebateDetailsVos = new ArrayList<>();
-        List<ScmSpecialRebateDetailsVo> data = scmSpecialrebateCheckapplydetailFeign.specialRebateCheckDetails(sid).getData();
+        List<ScmSpecialRebateDetailsVo> data = scmSpecialrebateCheckapplydetailFeign.appMx(sid).getData();
         for (ScmSpecialRebateDetailsVo datum : data) {
             AppSpecialRebateDetailsVo appSpecialRebateDetailsVo = new AppSpecialRebateDetailsVo();
             BeanUtil.copyProperties(datum,appSpecialRebateDetailsVo);

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<AppVehrebateCheckapplyDetailsVo> 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<AppVehrebateCheckapplydetailDetailsVo> when = appVehrebateCheckapplyDetailsVo.getScmWhenVehrebateCheckapplydetailDetails();
-        List<AppVehrebateCheckapplydetailDetailsVo> 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<List<AppVehRebateDetailsVo>> vehRebateCheckDetails(String sid) {
         ResultBean rb = ResultBean.fireFail();
         List<AppVehRebateDetailsVo> appVehRebateDetailsVos = new ArrayList<>();
-        List<ScmVehRebateDetailsVo> data = scmVehrebateCheckapplydetailFeign.vehRebateCheckDetails(sid).getData();
+        List<ScmVehRebateDetailsVo> data = scmVehrebateCheckapplydetailFeign.appMx(sid).getData();
         for (ScmVehRebateDetailsVo datum : data) {
             AppVehRebateDetailsVo appVehRebateDetailsVo = new AppVehRebateDetailsVo();
             BeanUtil.copyProperties(datum,appVehRebateDetailsVo);