From 923155bbc69a571c4f682b068c5a40627c6b6a2a Mon Sep 17 00:00:00 2001 From: God <10745413@qq.com> Date: Thu, 10 Oct 2024 17:10:18 +0800 Subject: [PATCH] 1 --- .../BusSalesOrderReturnVehApplyService.java | 24 ++++++ .../scmspecialrebate/ScmSpecialRebate.java | 4 - .../ScmSpecialRebateDetailsVo.java | 6 +- .../scmspecialrebate/ScmSpecialRebateDto.java | 4 - .../scmspecialrebate/ScmSpecialRebateVo.java | 2 + .../ScmSpecialrebateCheckapply.java | 4 - .../ScmSpecialrebateCheckapplyDetailsVo.java | 4 - .../ScmSpecialrebateCheckapplyDto.java | 4 - .../ScmSpecialrebateCheckapplyVo.java | 2 + .../ScmSpecialrebateCheckapplydetail.java | 4 - ...pecialrebateCheckapplydetailDetailsVo.java | 6 +- .../ScmSpecialrebateCheckapplydetailDto.java | 6 +- .../ScmSpecialrebateCheckapplydetailVo.java | 4 - .../scmvehrebate/ScmVehRebateDetailsVo.java | 2 + .../ScmSpecialRebateMapper.xml | 1 + .../ScmSpecialrebateCheckapplyMapper.xml | 1 + ...cmSpecialrebateCheckapplydetailMapper.java | 4 +- ...ScmSpecialrebateCheckapplydetailMapper.xml | 85 +++++++++++-------- .../ScmSpecialrebateCheckapplydetailRest.java | 2 +- ...mSpecialrebateCheckapplydetailService.java | 3 +- .../ScmSpecialRebateWithService.java | 9 +- .../ScmVehrebateCheckapplydetailMapper.java | 3 +- .../ScmVehrebateCheckapplydetailService.java | 3 +- .../ScmVehRebateWithService.java | 8 +- 24 files changed, 103 insertions(+), 92 deletions(-) diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java index 872d4c5509..e04991494e 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderreturnvehapply/BusSalesOrderReturnVehApplyService.java @@ -549,6 +549,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService variables = new HashMap<>(); //根据业务sid查询排产信息 BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(query.getBusinessSid()); + Boolean i = false; + String saleTypeKey = busSalesOrderReturnVehApply.getSaleTypeKey(); + if ("2".equals(saleTypeKey)) { + i = true; + } + variables.put("isAdj", i); bv.setFormVariables(variables); bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId()); ResultBean>> resultBean = flowTaskFeign.getPreviousNodesForReject(bv); @@ -877,6 +889,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService variables = new HashMap<>(); //根据业务sid查询排产信息 BusSalesOrderReturnVehApply busSalesOrderReturnVehApply = fetchBySid(query.getBusinessSid()); + Boolean i = false; + String saleTypeKey = busSalesOrderReturnVehApply.getSaleTypeKey(); + if ("2".equals(saleTypeKey)) { + i = true; + } + variables.put("isAdj", i); bv.setFormVariables(variables); bv.setModelId(ProcDefEnum.BUSSALESORDERRETURNVEHAPPLY.getProDefId()); ResultBean>> resultBean = flowTaskFeign.getNextNodesForSubmit(bv); @@ -913,6 +931,12 @@ public class BusSalesOrderReturnVehApplyService extends MybatisBaseService appMap = new HashMap<>(); appMap.put("sid", businessSid); variables.put("app", appMap); + Boolean i = false; + String saleTypeKey = busSalesOrderReturnVehApply.getSaleTypeKey(); + if ("2".equals(saleTypeKey)) { + i = true; + } + variables.put("isAdj", i); flowTaskVo.setValues(variables); ResultBean resultBean = flowableFeign.taskReject(flowTaskVo); if (!resultBean.getSuccess()) { diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java index db5f856bb5..d8b13d941e 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebate.java @@ -82,10 +82,6 @@ public class ScmSpecialRebate extends BaseEntity { private String adjustmentRemarks; // 调整说明 @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("计算方式key") - private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") - private String calculationModeValue; // 计算方式Value @ApiModelProperty("采购系统sid") private String purchaseSystemSid; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java index fb7e363acb..4b396060bc 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDetailsVo.java @@ -96,10 +96,6 @@ public class ScmSpecialRebateDetailsVo implements Vo { private String adjustmentRemarks; // 调整说明 @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("计算方式key") - private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") - private String calculationModeValue; // 计算方式Value @ApiModelProperty("采购系统sid") private String purchaseSystemSid; @@ -151,4 +147,6 @@ public class ScmSpecialRebateDetailsVo implements Vo { private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; + + private String specialRebateSid; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java index 844fd1f5ee..2e7759e020 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateDto.java @@ -91,10 +91,6 @@ public class ScmSpecialRebateDto implements Dto { private String adjustmentRemarks; // 调整说明 @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("计算方式key") - private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") - private String calculationModeValue; // 计算方式Value @ApiModelProperty("采购系统sid") private String purchaseSystemSid; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java index 3482c5c701..f5ac18cfc8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java @@ -55,6 +55,8 @@ public class ScmSpecialRebateVo implements Vo { private String sid; + @ApiModelProperty("专项返利sid") + private String specialRebateSid; @ApiModelProperty("状态") private String state; @ApiModelProperty("创建组织名称") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java index 95f29587b1..74bbfc9195 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapply.java @@ -54,10 +54,6 @@ public class ScmSpecialrebateCheckapply extends BaseEntity { private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 @ApiModelProperty("创建人姓名") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java index 57be1be5d6..237a266ea6 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDetailsVo.java @@ -62,10 +62,6 @@ public class ScmSpecialrebateCheckapplyDetailsVo implements Vo { private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 @ApiModelProperty("创建人姓名") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java index 2858fe18e1..2df0c21833 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyDto.java @@ -62,10 +62,6 @@ public class ScmSpecialrebateCheckapplyDto implements Dto { private String deptSid; @ApiModelProperty("申请部门名称") private String deptName; - @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") - private String brandName; // 品牌名称 @ApiModelProperty("核对申请标题") private String checkApply; // 核对申请标题 @ApiModelProperty("创建人姓名") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java index 2b8f660814..9015e07a90 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyVo.java @@ -67,6 +67,8 @@ public class ScmSpecialrebateCheckapplyVo implements Vo { private String createOrgName; // 创建组织名称 @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 + @ApiModelProperty("其中预提费用") + private String withholdCost; @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 @ApiModelProperty("待确定金额") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java index 5b7cc857ad..0ef42b353f 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetail.java @@ -87,10 +87,6 @@ public class ScmSpecialrebateCheckapplydetail extends BaseEntity { private String adjustmentRemarks; // 调整说明 @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("计算方式key") - private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") - private String calculationModeValue; // 计算方式Value @ApiModelProperty("采购系统sid") private String purchaseSystemSid; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java index 6301154278..b22323d37a 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDetailsVo.java @@ -63,12 +63,10 @@ public class ScmSpecialrebateCheckapplydetailDetailsVo implements Vo { private String rebateTypeValue; // 返利类型value @ApiModelProperty("台数") private String num; // 台数 - @ApiModelProperty("预提数量") - private String withholdingAmount; // 预提数量 - @ApiModelProperty("上传数量") - private String uploadAmount; // 上传数量 @ApiModelProperty("预提金额") private String withRebate; // 预提金额 + @ApiModelProperty("其中预提费用") + private String withholdCost; @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 @ApiModelProperty("待确定金额") diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java index 94eeed2cd6..68a0d5ed4c 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailDto.java @@ -55,7 +55,7 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto { private String sid; // sid @ApiModelProperty("专项返利sid") - private String specialRebateSids; // 专项返利sid + private String specialRebateSid; @ApiModelProperty("核对申请sid") private String mainSid; // 核对申请sid @@ -89,10 +89,6 @@ public class ScmSpecialrebateCheckapplydetailDto implements Dto { private String adjustmentRemarks; // 调整说明 @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("计算方式key") - private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") - private String calculationModeValue; // 计算方式Value @ApiModelProperty("采购系统sid") private String purchaseSystemSid; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java index ad4278897a..96022b5003 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java @@ -88,10 +88,6 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo { private String adjustmentRemarks; // 调整说明 @ApiModelProperty("调整状态") private Integer adjustmentState; - @ApiModelProperty("计算方式key") - private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") - private String calculationModeValue; // 计算方式Value @ApiModelProperty("采购系统sid") private String purchaseSystemSid; diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java index fe1d425d28..0b6eac610d 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java @@ -159,4 +159,6 @@ public class ScmVehRebateDetailsVo implements Vo { private String createOrgName; // 创建组织名称 @ApiModelProperty("组织全路径") private String orgPath; + + private String vehRebateSid; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml index 8726f73c72..99044bdf07 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml @@ -15,6 +15,7 @@ - SELECT * FROM scm_specialrebate_checkapplydetail ${ew.sqlSegment} - + + + - + - + + + \ 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 10fd376000..8506de604a 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 @@ -55,7 +55,7 @@ import com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail.ScmSpecialrebateCh * @since 1.0 */ @Api(tags = "专项返利核对申请表_返利列表") -@RestController("com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail.ScmSpecialrebateCheckapplydetailRest") +@RestController @RequestMapping("v1/scmspecialrebatecheckapplydetail") public class ScmSpecialrebateCheckapplydetailRest implements ScmSpecialrebateCheckapplydetailFeign { 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 1c8bd00a4b..e5fd0a5800 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 @@ -28,6 +28,7 @@ package com.yxt.anrui.scm.biz.scmspecialrebatecheckapplydetail; import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateDetailsVo; import com.yxt.anrui.scm.biz.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailService; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -125,7 +126,7 @@ public class ScmSpecialrebateCheckapplydetailService extends MybatisBaseService< return baseMapper.selByMainSid(sid); } - public ScmSpecialrebateCheckapplydetailVo fetchBySpecialRebateSid(String specialRebateSid) { + public ScmSpecialRebateDetailsVo fetchBySpecialRebateSid(String specialRebateSid) { return baseMapper.fetchBySpecialRebateSid(specialRebateSid); } } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java index 915462c7be..38cb97c23a 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatewith/ScmSpecialRebateWithService.java @@ -139,11 +139,10 @@ public class ScmSpecialRebateWithService extends MybatisBaseService scmSpecialRebateDetailsVos = new ArrayList<>(); String[] sids = sid.split(","); for (String s : sids) { - ScmSpecialrebateCheckapplydetailVo scmSpecialrebateCheckapplydetailVo = scmSpecialrebateCheckapplydetailService.fetchBySpecialRebateSid(s); - if (scmSpecialrebateCheckapplydetailVo != null){ - ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = new ScmSpecialRebateDetailsVo(); - BeanUtil.copyProperties(scmSpecialrebateCheckapplydetailVo,scmSpecialRebateDetailsVo); - scmSpecialRebateDetailsVo.setMoney(scmSpecialrebateCheckapplydetailVo.getOnceItureCost().add(scmSpecialrebateCheckapplydetailVo.getOnceTreatCost()).add(scmSpecialrebateCheckapplydetailVo.getOnceSuppCost()).add(scmSpecialrebateCheckapplydetailVo.getSecondItureCost()).add(scmSpecialrebateCheckapplydetailVo.getSecondTreatCost()).add(scmSpecialrebateCheckapplydetailVo.getSecondSuppCost()).toString()); + ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = scmSpecialrebateCheckapplydetailService.fetchBySpecialRebateSid(s); + if (scmSpecialRebateDetailsVo != null){ + scmSpecialRebateDetailsVo.setExpectCost(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); } } 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 4147667d3b..b610045aa8 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 @@ -29,6 +29,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.toolkit.Constants; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import com.yxt.anrui.scm.api.scmvehrebatecheckapplydetail.ScmVehrebateCheckapplydetailDetailsVo; import org.apache.ibatis.annotations.Delete; import org.apache.ibatis.annotations.Mapper; @@ -76,5 +77,5 @@ public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper selByMainSid(String mainSid); @Select("select * from scm_vehrebate_checkapplydetail where vehRebateSid = #{vehRebateSid}") - ScmVehrebateCheckapplydetailVo selByVehRebteSid(String vehRebateSid); + ScmVehRebateDetailsVo selByVehRebteSid(String vehRebateSid); } \ No newline at end of file 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 d224e9c0f7..3685f7a89b 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 @@ -29,6 +29,7 @@ import cn.hutool.core.bean.BeanUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebate; +import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; @@ -84,7 +85,7 @@ public class ScmVehrebateCheckapplydetailService extends MybatisBaseService scmVehRebateDetailsVos = new ArrayList<>(); String[] sids = sid.split(","); for (String s : sids) { - ScmVehrebateCheckapplydetailVo scmVehrebateCheckapplydetailVo = scmVehrebateCheckapplydetailService.selByVehRebteSid(s); - if (scmVehrebateCheckapplydetailVo != null){ - ScmVehRebateDetailsVo scmVehRebateDetailsVo = new ScmVehRebateDetailsVo(); - BeanUtil.copyProperties(scmVehrebateCheckapplydetailVo,scmVehRebateDetailsVo); - scmVehRebateDetailsVo.setMoney(scmVehrebateCheckapplydetailVo.getOnceTreatCost().add(scmVehrebateCheckapplydetailVo.getOnceSuppCost()).add(scmVehrebateCheckapplydetailVo.getSecondTreatCost()).add(scmVehrebateCheckapplydetailVo.getSecondSuppCost()).toString()); + ScmVehRebateDetailsVo scmVehRebateDetailsVo = scmVehrebateCheckapplydetailService.selByVehRebteSid(s); + if (scmVehRebateDetailsVo != null){ + scmVehRebateDetailsVo.setMoney(scmVehRebateDetailsVo.getOnceTreatCost().add(scmVehRebateDetailsVo.getOnceSuppCost()).add(scmVehRebateDetailsVo.getSecondTreatCost()).add(scmVehRebateDetailsVo.getSecondSuppCost()).toString()); scmVehRebateDetailsVos.add(scmVehRebateDetailsVo); } }