Merge remote-tracking branch 'origin/master'

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateVo.java

@@ -61,13 +61,19 @@ public class ScmSpecialRebateVo implements Vo {
     private String state;
     @ApiModelProperty("创建组织名称")
     private String createOrgName;
+    @ApiModelProperty("采购系统sid")
+    private String purchaseSystemSid;
     @ApiModelProperty("采购系统名称")
     private String purchaseSystemName;
+    @ApiModelProperty("品牌sid")
+    private String brandSid;
     @ApiModelProperty("品牌名称")
     private String brandName;
     @ApiModelProperty("创建日期")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private Date createTime;
+    @ApiModelProperty("返利类型key")
+    private String rebateTypeKey;
     @ApiModelProperty("返利类型value")
     private String rebateTypeValue;
     @ApiModelProperty("返利名称")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapplydetail/ScmSpecialrebateCheckapplydetailVo.java

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.api.scmspecialrebatecheckapplydetail;
 
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.vo.Vo;
 
 import io.swagger.annotations.ApiModel;
@@ -33,6 +34,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * Project: anrui-scm(专项返利) <br/>
@@ -52,7 +54,6 @@ import java.math.BigDecimal;
 public class ScmSpecialrebateCheckapplydetailVo implements Vo {
 
     private String sid; // sid
-
 	@ApiModelProperty("专项返利sid")
     private String specialRebateSid; // 专项返利sid
 	@ApiModelProperty("核对申请sid")
@@ -74,6 +75,8 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo {
     private String rebateName; // 返利名称
     @ApiModelProperty("预计返利")
     private String estimateRebate; // 预计返利
+    @ApiModelProperty("其中预提费用")
+    private String withholdCost;
     @ApiModelProperty("预提日期")
     private String withholdingDate; // 预提日期
     @ApiModelProperty("上传日期")
@@ -129,4 +132,7 @@ public class ScmSpecialrebateCheckapplydetailVo implements Vo {
     @ApiModelProperty("二次抵顶费用说明")
     private String secondSuppRemark;
     private String money;
+    @ApiModelProperty("创建日期")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date createTime;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebatecheckapply/ScmSpecialrebateCheckapplyService.java

@@ -286,6 +286,7 @@ public class ScmSpecialrebateCheckapplyService extends MybatisBaseService<ScmSpe
                     money = money.add(s.getSecondSuppCost());
                 }
                 s.setMoney(money.toString());
+                s.setSid(s.getSpecialRebateSid());
             }
         }
         scmSpecialrebateCheckapplyDetailsVo.setScmSpecialrebateCheckapplydetailDetails(scmSpecialrebateCheckapplydetailVos);