更改

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapply/FinPaymentapplyService.java

@@ -622,6 +622,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                         //收款银行账号
                         finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailVo.getReceivingAccount());
                         finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailVo.getBank());
+                        //收款单位名称
+                        finPaymentrecordDto.setReceiveCompany(finPaymentapplyDetailVo.getReceiveCompany());
                         //金额
                         if (StringUtils.isNotBlank(finPaymentapplyDetailVo.getPayAccount())) {
                             finPaymentrecordDto.setCost(finPaymentapplyDetailVo.getPayAccount());
@@ -645,6 +647,8 @@ public class FinPaymentapplyService extends MybatisBaseService<FinPaymentapplyMa
                             //收款银行账号
                             finPaymentrecordDto.setReceiveBankAccount(finPaymentapplyDetailsBelowDetailsVo.getReceivingAccount());
                             finPaymentrecordDto.setReceiveBank(finPaymentapplyDetailsBelowDetailsVo.getBank());
+                            //收款单位名称
+                            finPaymentrecordDto.setReceiveCompany(finPaymentapplyDetailsBelowDetailsVo.getReceiveCompany());
                             //金额
                             if (finPaymentapplyDetailsBelowDetailsVo.getPayAccount() != null) {
                                 finPaymentrecordDto.setCost(finPaymentapplyDetailsBelowDetailsVo.getPayAccount().toString());

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetails/FinPaymentapplyDetailsMapper.xml

@@ -11,7 +11,7 @@
                fd.remarks,
                fd.costTitleValue,
                fd.receiveCompany,
-               SUM(fdb.payAccount) AS payAccountTotal
+               IFNULL(SUM(fdb.payAccount), 0) AS payAccountTotal
         from fin_paymentapply_details fd
                  LEFT JOIN fin_paymentapply_details_below fdb
                            ON fd.sid = fdb.detailSid

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebate.java

@@ -54,57 +54,57 @@ import java.util.Date;
 public class ScmVehRebate extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-	@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("待确定金额(动态)")
     private String stayDetermineMoney;
     @ApiModelProperty("待确定金额(常量)")
     private String stayDetermineMoneyNew;
-	@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("调整状态")
     private Integer adjustmentState;
@@ -139,13 +139,13 @@ public class ScmVehRebate extends BaseEntity {
     @ApiModelProperty("二次抵顶费用说明")
     private String secondSuppRemark;
 
-	@ApiModelProperty("使用组织sid")
+    @ApiModelProperty("使用组织sid")
     private String useOrgSid; // 使用组织sid
-	@ApiModelProperty("使用组织名称")
+    @ApiModelProperty("使用组织名称")
     private String useOrgName; // 使用组织名称
-	@ApiModelProperty("创建组织sid")
+    @ApiModelProperty("创建组织sid")
     private String createOrgSid; // 创建组织sid
-	@ApiModelProperty("创建组织名称")
+    @ApiModelProperty("创建组织名称")
     private String createOrgName; // 创建组织名称
     @ApiModelProperty("组织全路径")
     private String orgPath;
@@ -155,6 +155,4 @@ public class ScmVehRebate extends BaseEntity {
     private String purchaseSystemName;
 
 
-
-
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateExcelVo.java

@@ -51,12 +51,16 @@ public class ScmVehRebateExcelVo {
     private String manufactorSettlementPrice;
     @ExportEntityMap(CnName = "其中运费", EnName = "freight")
     private String freight;
+    @ExportEntityMap(CnName = "上装金额", EnName = "topAmount")
+    private String topAmount;
     @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
     private String createTime;
     @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
     private String rebateTypeValue;
     @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
     private String rebateName;
+    @ExportEntityMap(CnName = "计算方式", EnName = "calculationModeValue")
+    private String calculationModeValue;
     @ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard")
     private String calculationStandard;
     @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateVo.java

@@ -152,4 +152,6 @@ public class ScmVehRebateVo implements Vo {
     private String purchaseSystemSid;
     @ApiModelProperty("采购系统")
     private String purchaseSystemName;
+    @ApiModelProperty("上装金额")
+    private BigDecimal topAmount;
 }