From 958708b8f6a35ed33565cc9b3fa91e5c69f8cfc1 Mon Sep 17 00:00:00 2001 From: ligaode Date: Fri, 20 Dec 2024 14:56:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scm/api/scmvehrebate/ScmVehRebateVo.java | 58 +++++++++---------- .../ScmVehrebateCheckapplydetailVo.java | 2 + .../ScmVehrebateCheckapplydetailMapper.java | 5 +- 3 files changed, 32 insertions(+), 33 deletions(-) diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java index f9f4cc9d6f..56dc83c139 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java @@ -61,63 +61,63 @@ public class ScmVehRebateVo implements Vo { @ApiModelProperty("状态") private String state; // 状态 private String vehRebateSid; // 单车返利sid - @ApiModelProperty("品牌sid") + @ApiModelProperty("品牌sid") private String brandSid; // 品牌sid - @ApiModelProperty("品牌名称") + @ApiModelProperty("品牌名称") private String brandName; // 品牌名称 - @ApiModelProperty("车型sid") + @ApiModelProperty("车型sid") private String vehModelSid; // 车型sid - @ApiModelProperty("车型名称") + @ApiModelProperty("车型名称") private String vehModelName; // 车型名称 - @ApiModelProperty("车辆sid") + @ApiModelProperty("车辆sid") private String vehSid; // 车辆sid - @ApiModelProperty("车架号") + @ApiModelProperty("车架号") private String vinNo; // 车架号 - @ApiModelProperty("厂家结算价") + @ApiModelProperty("厂家结算价") private String manufactorSettlementPrice; // 厂家结算价 - @ApiModelProperty("运费") + @ApiModelProperty("运费") private String freight; // 运费 - @ApiModelProperty("返利类型key") + @ApiModelProperty("返利类型key") private String rebateTypeKey; // 返利类型key - @ApiModelProperty("返利类型value") + @ApiModelProperty("返利类型value") private String rebateTypeValue; // 返利类型value - @ApiModelProperty("返利名称") + @ApiModelProperty("返利名称") private String rebateName; // 返利名称 - @ApiModelProperty("计算标准") + @ApiModelProperty("计算标准") private String calculationStandard; // 计算标准 - @ApiModelProperty("预计返利") + @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 - @ApiModelProperty("所属年月") + @ApiModelProperty("所属年月") private String palceGenDate; // 所属年月 - @ApiModelProperty("预提日期") + @ApiModelProperty("预提日期") private String withholdingDate; // 预提日期 - @ApiModelProperty("上传日期") + @ApiModelProperty("上传日期") private String uploadDate; // 上传日期 - @ApiModelProperty("上传金额") + @ApiModelProperty("上传金额") private String uploadMoney; // 上传金额 - @ApiModelProperty("二次上传日期") + @ApiModelProperty("二次上传日期") private String secondaryUploadDate; // 二次上传日期 - @ApiModelProperty("二次上传金额") + @ApiModelProperty("二次上传金额") private String secondaryUploadMoney; // 二次上传金额 - @ApiModelProperty("待确定金额") + @ApiModelProperty("待确定金额") private String stayDetermineMoney; // 待确定金额 - @ApiModelProperty("是否调整") + @ApiModelProperty("是否调整") private String isAdjustment; // 是否调整 - @ApiModelProperty("调整金额") + @ApiModelProperty("调整金额") private String adjustmentMoney; // 调整金额 - @ApiModelProperty("调整说明") + @ApiModelProperty("调整说明") private String adjustmentRemarks; // 调整说明 - @ApiModelProperty("计算方式key") + @ApiModelProperty("计算方式key") private String calculationModeKey; // 计算方式key - @ApiModelProperty("计算方式Value") + @ApiModelProperty("计算方式Value") private String calculationModeValue; // 计算方式Value - @ApiModelProperty("使用组织sid") + @ApiModelProperty("使用组织sid") private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") + @ApiModelProperty("使用组织名称") private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") + @ApiModelProperty("创建组织sid") private String createOrgSid; // 创建组织sidu - @ApiModelProperty("创建组织名称") + @ApiModelProperty("创建组织名称") private String createOrgName; // 创建组织名称 @ApiModelProperty("上传状态(0未上传、1已上传)") private String uploadState; // 上传状态 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java index 711d9819a6..5deb560301 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapplydetail/ScmVehrebateCheckapplydetailVo.java @@ -82,6 +82,8 @@ public class ScmVehrebateCheckapplydetailVo implements Vo { private String calculationStandard; // 计算标准 @ApiModelProperty("预计返利") private String estimateRebate; // 预计返利 + @ApiModelProperty("其中预提费用") + private String withholdCost; @ApiModelProperty("所属年月") private String palceGenDate; // 所属年月 @ApiModelProperty("预提日期") 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 891c10c3a3..7491a98f2d 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 @@ -56,9 +56,6 @@ import java.util.List; @Mapper public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper { - //@Update("update scm_vehrebate_checkapplydetail set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); @@ -73,7 +70,7 @@ public interface ScmVehrebateCheckapplydetailMapper extends BaseMapper fetchLastDetailsVoBySid(String sid); - @Select("select * from scm_vehrebate_checkapplydetail where mainSid = #{sid}") + @Select("select *,expectTreatCost + expectSuppCost as withholdCost from scm_vehrebate_checkapplydetail where mainSid = #{sid}") List selByMainSid(String mainSid); @Select("select * from scm_vehrebate_checkapplydetail where mainSid = #{mainSid}")