更改

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

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