更改

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

@@ -26,6 +26,7 @@
 package com.yxt.anrui.scm.api.scmspecialrebate;
 
 import com.yxt.common.core.utils.ExportEntityMap;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -35,8 +36,6 @@ public class ScmSpecialRebateExcelVo {
 
     @ExportEntityMap(CnName = "序号", EnName = "rankNo")
     private Integer rankNo;
-    @ExportEntityMap(CnName = "状态", EnName = "state")
-    private String state;
     @ExportEntityMap(CnName = "分公司", EnName = "createOrgName")
     private String createOrgName;
     @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
@@ -49,46 +48,50 @@ public class ScmSpecialRebateExcelVo {
     private String rebateTypeValue;
     @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
     private String rebateName;
-    @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
+    @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
-    private String estimateRebate;
+    private BigDecimal estimateRebate;
     @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
-    private String expectItureCost;
+    private BigDecimal expectItureCost;
     @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
-    private String expectTreatCost;
+    private BigDecimal expectTreatCost;
     @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
-    private String expectSuppCost;
+    private BigDecimal expectSuppCost;
     @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
     private String palceGenDate;
-    @ExportEntityMap(CnName = "预提日期", EnName = "withholdingDate")
-    private String withholdingDate;
     @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
     private String uploadDate;
     @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
-    private String uploadMoney;
+    private BigDecimal uploadMoney;
-    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
-    private String secondaryUploadDate;
-    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
-    private String secondaryUploadMoney;
     @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
-    private String stayDetermineMoney;
+    private BigDecimal stayDetermineMoney;
-    @ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost")
+    @ExportEntityMap(CnName = "其中支出费用", EnName = "onceItureCost")
     private BigDecimal onceItureCost;
-    @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost")
+    @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
     private BigDecimal onceTreatCost;
-    @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost")
+    @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
     private BigDecimal onceSuppCost;
-    @ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost")
+    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
+    private String secondaryUploadDate;
+    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
+    private BigDecimal secondaryUploadMoney;
+    @ExportEntityMap(CnName = "其中支出费用", EnName = "secondItureCost")
     private BigDecimal secondItureCost;
-    @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost")
+    @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
     private BigDecimal secondTreatCost;
-    @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost")
+    @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
     private BigDecimal secondSuppCost;
     @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
-    private String diffAmount;
+    private BigDecimal diffAmount;
     @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
     private String isAdjustment;
-    @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
+    @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney")
-    private String adjustmentMoney;
+    private BigDecimal adjustmentMoney;
+    @ExportEntityMap(CnName = "支出费用调整金额", EnName = "itureAdjustmentMoney")
+    private BigDecimal itureAdjustmentMoney;
+    @ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney")
+    private BigDecimal treatAdjustmentMoney;
+    @ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney")
+    private BigDecimal suppAdjustmentMoney;
     @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
     private String adjustmentRemarks;
     @ExportEntityMap(CnName = "备注", EnName = "remarks")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatecheckapply/SpecialRebateCheckExcelVo.java

@@ -40,7 +40,7 @@ public class SpecialRebateCheckExcelVo {
     private String createOrgName;
     @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
     private String purchaseSystemName;
-    @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
+    @ExportEntityMap(CnName = "品牌", EnName = "brandName")
     private String brandName;
     @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
     private String createTime;
@@ -48,44 +48,52 @@ public class SpecialRebateCheckExcelVo {
     private String rebateTypeValue;
     @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
     private String rebateName;
-    @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
+    @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
-    private String estimateRebate;
+    private BigDecimal estimateRebate;
     @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
-    private String expectItureCost;
+    private BigDecimal expectItureCost;
     @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
-    private String expectTreatCost;
+    private BigDecimal expectTreatCost;
     @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
-    private String expectSuppCost;
+    private BigDecimal expectSuppCost;
     @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
     private String palceGenDate;
     @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
     private String uploadDate;
     @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
-    private String uploadMoney;
+    private BigDecimal uploadMoney;
-    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
-    private String secondaryUploadDate;
-    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
-    private String secondaryUploadMoney;
     @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
-    private String stayDetermineMoney;
+    private BigDecimal stayDetermineMoney;
-    @ExportEntityMap(CnName = "一次支出费用", EnName = "onceItureCost")
+    @ExportEntityMap(CnName = "其中支出费用", EnName = "onceItureCost")
     private BigDecimal onceItureCost;
-    @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost")
+    @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
     private BigDecimal onceTreatCost;
-    @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost")
+    @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
     private BigDecimal onceSuppCost;
-    @ExportEntityMap(CnName = "二次支出费用", EnName = "secondItureCost")
+    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
+    private String secondaryUploadDate;
+    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
+    private BigDecimal secondaryUploadMoney;
+    @ExportEntityMap(CnName = "其中支出费用", EnName = "secondItureCost")
     private BigDecimal secondItureCost;
-    @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost")
+    @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
     private BigDecimal secondTreatCost;
-    @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost")
+    @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
     private BigDecimal secondSuppCost;
     @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
-    private String diffAmount;
+    private BigDecimal diffAmount;
     @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
     private String isAdjustment;
-    @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
+    @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney")
-    private String adjustmentMoney;
+    private BigDecimal adjustmentMoney;
+    @ExportEntityMap(CnName = "支出费用调整金额", EnName = "itureAdjustmentMoney")
+    private BigDecimal itureAdjustmentMoney;
+    @ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney")
+    private BigDecimal treatAdjustmentMoney;
+    @ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney")
+    private BigDecimal suppAdjustmentMoney;
     @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
     private String adjustmentRemarks;
+    @ExportEntityMap(CnName = "备注", EnName = "remarks")
+    private String remarks;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebatewith/SpectalRebateWithExcelVo.java

@@ -48,7 +48,7 @@ public class SpectalRebateWithExcelVo {
     private String rebateTypeValue;
     @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
     private String rebateName;
-    @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
+    @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
     private String estimateRebate;
     @ExportEntityMap(CnName = "其中支出费用", EnName = "expectItureCost")
     private BigDecimal expectItureCost;
@@ -56,10 +56,6 @@ public class SpectalRebateWithExcelVo {
     private BigDecimal expectTreatCost;
     @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
     private BigDecimal expectSuppCost;
-    @ExportEntityMap(CnName = "抵顶费用说明", EnName = "expectSuppRemark")
-    private String expectSuppRemark;
     @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
     private String palceGenDate;
-    @ExportEntityMap(CnName = "备注", EnName = "remarks")
-    private String remarks;
 }

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

@@ -26,7 +26,6 @@
 package com.yxt.anrui.scm.api.scmvehrebate;
 
 import com.yxt.common.core.utils.ExportEntityMap;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -40,16 +39,16 @@ public class ScmVehRebateExcelVo {
     private String purchaseSystemName;
     @ExportEntityMap(CnName = "品牌", EnName = "brandName")
     private String brandName;
-    @ExportEntityMap(CnName = "车型名称", EnName = "vehModelName")
+    @ExportEntityMap(CnName = "车型", EnName = "vehModelName")
     private String vehModelName;
     @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
     private String vinNo;
     @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
-    private String manufactorSettlementPrice;
+    private BigDecimal manufactorSettlementPrice;
     @ExportEntityMap(CnName = "其中运费", EnName = "freight")
-    private String freight;
+    private BigDecimal freight;
     @ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount")
-    private String topAmount;
+    private BigDecimal topAmount;
     @ExportEntityMap(CnName = "创建日期", EnName = "createTime")
     private String createTime;
     @ExportEntityMap(CnName = "返利类型", EnName = "rebateTypeValue")
@@ -57,19 +56,19 @@ public class ScmVehRebateExcelVo {
     @ExportEntityMap(CnName = "返利名称", EnName = "rebateName")
     private String rebateName;
     @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
-    private String estimateRebate;
+    private BigDecimal estimateRebate;
     @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
-    private String expectTreatCost;
+    private BigDecimal expectTreatCost;
     @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
-    private String expectSuppCost;
+    private BigDecimal expectSuppCost;
     @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
     private String palceGenDate;
     @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
     private String uploadDate;
     @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
-    private String uploadMoney;
+    private BigDecimal uploadMoney;
     @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
-    private String stayDetermineMoney;
+    private BigDecimal stayDetermineMoney;
     @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
     private BigDecimal onceTreatCost;
     @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
@@ -77,17 +76,17 @@ public class ScmVehRebateExcelVo {
     @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
     private String secondaryUploadDate;
     @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
-    private String secondaryUploadMoney;
+    private BigDecimal secondaryUploadMoney;
     @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
     private BigDecimal secondTreatCost;
     @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
     private BigDecimal secondSuppCost;
     @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
-    private String diffAmount;
+    private BigDecimal diffAmount;
     @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
     private String isAdjustment;
     @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney")
-    private String adjustmentMoney;
+    private BigDecimal adjustmentMoney;
     @ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney")
     private BigDecimal treatAdjustmentMoney;
     @ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney")

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatecheckapply/VehRebateCheckExcelVo.java

@@ -38,58 +38,60 @@ public class VehRebateCheckExcelVo {
     private Integer rankNo;
     @ExportEntityMap(CnName = "采购系统", EnName = "purchaseSystemName")
     private String purchaseSystemName;
-    @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
+    @ExportEntityMap(CnName = "品牌", EnName = "brandName")
     private String brandName;
-    @ExportEntityMap(CnName = "车型名称", EnName = "vehModelName")
+    @ExportEntityMap(CnName = "车型", EnName = "vehModelName")
     private String vehModelName;
     @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
     private String vinNo;
     @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
-    private String manufactorSettlementPrice;
+    private BigDecimal manufactorSettlementPrice;
     @ExportEntityMap(CnName = "其中运费", EnName = "freight")
-    private String freight;
+    private BigDecimal freight;
+    @ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount")
+    private BigDecimal 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")
+    @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
-    private String calculationModeValue;
+    private BigDecimal estimateRebate;
-    @ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard")
-    private String calculationStandard;
-    @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
-    private String estimateRebate;
     @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
-    private String expectTreatCost;
+    private BigDecimal expectTreatCost;
     @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
-    private String expectSuppCost;
+    private BigDecimal expectSuppCost;
     @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
     private String palceGenDate;
     @ExportEntityMap(CnName = "上传日期", EnName = "uploadDate")
     private String uploadDate;
     @ExportEntityMap(CnName = "上传金额", EnName = "uploadMoney")
-    private String uploadMoney;
+    private BigDecimal uploadMoney;
-    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
-    private String secondaryUploadDate;
-    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
-    private String secondaryUploadMoney;
     @ExportEntityMap(CnName = "其中待确定金额", EnName = "stayDetermineMoney")
-    private String stayDetermineMoney;
+    private BigDecimal stayDetermineMoney;
-    @ExportEntityMap(CnName = "一次待支付费用", EnName = "onceTreatCost")
+    @ExportEntityMap(CnName = "其中待支付费用", EnName = "onceTreatCost")
     private BigDecimal onceTreatCost;
-    @ExportEntityMap(CnName = "一次抵顶费用", EnName = "onceSuppCost")
+    @ExportEntityMap(CnName = "其中抵顶费用", EnName = "onceSuppCost")
     private BigDecimal onceSuppCost;
-    @ExportEntityMap(CnName = "二次待支付费用", EnName = "secondTreatCost")
+    @ExportEntityMap(CnName = "二次上传日期", EnName = "secondaryUploadDate")
+    private String secondaryUploadDate;
+    @ExportEntityMap(CnName = "二次上传金额", EnName = "secondaryUploadMoney")
+    private BigDecimal secondaryUploadMoney;
+    @ExportEntityMap(CnName = "其中待支付费用", EnName = "secondTreatCost")
     private BigDecimal secondTreatCost;
-    @ExportEntityMap(CnName = "二次抵顶费用", EnName = "secondSuppCost")
+    @ExportEntityMap(CnName = "其中抵顶费用", EnName = "secondSuppCost")
     private BigDecimal secondSuppCost;
     @ExportEntityMap(CnName = "差异金额", EnName = "diffAmount")
-    private String diffAmount;
+    private BigDecimal diffAmount;
     @ExportEntityMap(CnName = "是否调整", EnName = "isAdjustment")
     private String isAdjustment;
-    @ExportEntityMap(CnName = "调整金额", EnName = "adjustmentMoney")
+    @ExportEntityMap(CnName = "返利调整金额", EnName = "adjustmentMoney")
-    private String adjustmentMoney;
+    private BigDecimal adjustmentMoney;
+    @ExportEntityMap(CnName = "待支付费用调整金额", EnName = "treatAdjustmentMoney")
+    private BigDecimal treatAdjustmentMoney;
+    @ExportEntityMap(CnName = "抵顶费用调整金额", EnName = "suppAdjustmentMoney")
+    private BigDecimal suppAdjustmentMoney;
     @ExportEntityMap(CnName = "调整说明", EnName = "adjustmentRemarks")
     private String adjustmentRemarks;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebatewith/ExcelVo.java

@@ -28,6 +28,7 @@ package com.yxt.anrui.scm.api.scmvehrebatewith;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.yxt.common.core.utils.ExportEntityMap;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.math.BigDecimal;
@@ -42,32 +43,28 @@ public class ExcelVo {
     private String purchaseSystemName;
     @ExportEntityMap(CnName = "品牌名称", EnName = "brandName")
     private String brandName;
-    @ExportEntityMap(CnName = "车型名称", EnName = "vehModelName")
+    @ExportEntityMap(CnName = "车型", EnName = "vehModelName")
     private String vehModelName;
     @ExportEntityMap(CnName = "车架号", EnName = "vinNo")
     private String vinNo;
     @ExportEntityMap(CnName = "车辆入库价", EnName = "manufactorSettlementPrice")
-    private String manufactorSettlementPrice;
+    private BigDecimal manufactorSettlementPrice;
     @ExportEntityMap(CnName = "其中运费", EnName = "freight")
-    private String freight;
+    private BigDecimal freight;
+    @ExportEntityMap(CnName = "其中上装金额", EnName = "topAmount")
+    private BigDecimal 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")
+    @ExportEntityMap(CnName = "预提金额", EnName = "estimateRebate")
-    private String calculationModeValue;
+    private BigDecimal estimateRebate;
-    @ExportEntityMap(CnName = "计算标准", EnName = "calculationStandard")
-    private String calculationStandard;
-    @ExportEntityMap(CnName = "预计返利", EnName = "estimateRebate")
-    private String estimateRebate;
     @ExportEntityMap(CnName = "其中待支付费用", EnName = "expectTreatCost")
     private BigDecimal expectTreatCost;
     @ExportEntityMap(CnName = "其中抵顶费用", EnName = "expectSuppCost")
     private BigDecimal expectSuppCost;
-    @ExportEntityMap(CnName = "抵顶费用说明", EnName = "expectSuppRemark")
-    private String expectSuppRemark;
     @ExportEntityMap(CnName = "所属年月", EnName = "palceGenDate")
     private String palceGenDate;
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@@ -1635,22 +1635,10 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
         qw.orderByDesc("createTime");
         List<ScmSpecialRebateExcelVo> scmSpecialRebateExcelVos = baseMapper.excelList(qw);
         for (ScmSpecialRebateExcelVo scmSpecialRebateExcelVo : scmSpecialRebateExcelVos) {
-            if (scmSpecialRebateExcelVo.getState().equals("0")){
-                scmSpecialRebateExcelVo.setState("未预提");
-            }else if (scmSpecialRebateExcelVo.getState().equals("1")){
-                scmSpecialRebateExcelVo.setState("预提中");
-            }else if (scmSpecialRebateExcelVo.getState().equals("2")){
-                scmSpecialRebateExcelVo.setState("待核对");
-            }else if (scmSpecialRebateExcelVo.getState().equals("3")){
-                scmSpecialRebateExcelVo.setState("核对中");
-            }else if (scmSpecialRebateExcelVo.getState().equals("4")){
-                scmSpecialRebateExcelVo.setState("已核对");
-            }else if (scmSpecialRebateExcelVo.getState().equals("5")){
-                scmSpecialRebateExcelVo.setState("分配中");
-            }else if (scmSpecialRebateExcelVo.getState().equals("6")){
-                scmSpecialRebateExcelVo.setState("已分配");
-            }
             scmSpecialRebateExcelVo.setCreateTime(DateUtil.formatDate(DateUtil.parse(scmSpecialRebateExcelVo.getCreateTime())));
+            scmSpecialRebateExcelVo.setItureAdjustmentMoney(scmSpecialRebateExcelVo.getOnceItureCost().add(scmSpecialRebateExcelVo.getSecondItureCost()).subtract(scmSpecialRebateExcelVo.getExpectItureCost()));
+            scmSpecialRebateExcelVo.setTreatAdjustmentMoney(scmSpecialRebateExcelVo.getOnceTreatCost().add(scmSpecialRebateExcelVo.getSecondTreatCost()).subtract(scmSpecialRebateExcelVo.getExpectTreatCost()));
+            scmSpecialRebateExcelVo.setSuppAdjustmentMoney(scmSpecialRebateExcelVo.getOnceSuppCost().add(scmSpecialRebateExcelVo.getSecondSuppCost()).subtract(scmSpecialRebateExcelVo.getExpectSuppCost()));
         }
         return scmSpecialRebateExcelVos;
     }

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

@@ -123,6 +123,9 @@ public class ScmSpecialrebateCheckapplyRest implements ScmSpecialrebateCheckappl
             BeanUtil.copyProperties(datum,excelVo);
             excelVo.setRankNo(i);
             excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
+            excelVo.setItureAdjustmentMoney(excelVo.getOnceItureCost().add(excelVo.getSecondItureCost()).subtract(excelVo.getExpectItureCost()));
+            excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
+            excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
             i = i + 1;
             excelVos.add(excelVo);
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java

@@ -2033,6 +2033,10 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
                 );
         qw.orderByDesc("createTime");
         List<ScmVehRebateExcelVo> scmVehRebateExcelVos = baseMapper.excelList(qw);
+        for (ScmVehRebateExcelVo scmVehRebateExcelVo : scmVehRebateExcelVos) {
+            scmVehRebateExcelVo.setTreatAdjustmentMoney(scmVehRebateExcelVo.getOnceTreatCost().add(scmVehRebateExcelVo.getSecondTreatCost()).subtract(scmVehRebateExcelVo.getExpectTreatCost()));
+            scmVehRebateExcelVo.setSuppAdjustmentMoney(scmVehRebateExcelVo.getOnceSuppCost().add(scmVehRebateExcelVo.getSecondSuppCost()).subtract(scmVehRebateExcelVo.getExpectSuppCost()));
+        }
         return scmVehRebateExcelVos;
     }
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatecheckapply/ScmVehrebateCheckapplyRest.java

@@ -134,9 +134,8 @@ public class ScmVehrebateCheckapplyRest implements ScmVehrebateCheckapplyFeign {
             BeanUtil.copyProperties(datum,excelVo);
             excelVo.setRankNo(i);
             excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
-            if ("比例".equals(datum.getCalculationModeValue())){
+            excelVo.setTreatAdjustmentMoney(excelVo.getOnceTreatCost().add(excelVo.getSecondTreatCost()).subtract(excelVo.getExpectTreatCost()));
-                excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%");
+            excelVo.setSuppAdjustmentMoney(excelVo.getOnceSuppCost().add(excelVo.getSecondSuppCost()).subtract(excelVo.getExpectSuppCost()));
-            }
             i = i + 1;
             excelVos.add(excelVo);
         }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebatewith/ScmVehRebateWithRest.java

@@ -122,9 +122,6 @@ public class ScmVehRebateWithRest implements ScmVehRebateWithFeign {
             BeanUtil.copyProperties(datum,excelVo);
             excelVo.setRankNo(i);
             excelVo.setCreateTime(DateUtil.formatDate(datum.getCreateTime()));
-            if ("比例".equals(datum.getCalculationModeValue())){
-                excelVo.setCalculationStandard(excelVo.getCalculationStandard() + "%");
-            }
             i = i + 1;
             excelVos.add(excelVo);
         }