前端对接问题修复62

yd-csf-service/src/main/java/com/yd/csf/service/vo/CommissionExpectedExportDTO.java

@@ -7,6 +7,7 @@ import com.alibaba.excel.annotation.write.style.ContentRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.alibaba.excel.annotation.write.style.HeadRowHeight;
 import com.yd.csf.service.model.CommissionExpected;
 import com.yd.csf.service.model.CommissionExpected;
 import lombok.Data;
 import lombok.Data;
+import org.apache.commons.lang3.ObjectUtils;
 
 
 import java.math.BigDecimal;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Date;
@@ -14,7 +15,7 @@ import java.util.Date;
 @Data
 @Data
 @ContentRowHeight(15)
 @ContentRowHeight(15)
 @HeadRowHeight(20)
 @HeadRowHeight(20)
-@ColumnWidth(15)
+@ColumnWidth(25)
 public class CommissionExpectedExportDTO {
 public class CommissionExpectedExportDTO {
 
 
     @ExcelProperty("应收账款编号")
     @ExcelProperty("应收账款编号")
@@ -71,10 +72,18 @@ public class CommissionExpectedExportDTO {
     @ColumnWidth(20)
     @ColumnWidth(20)
     private BigDecimal paidAmount;
     private BigDecimal paidAmount;
 
 
+    @ExcelProperty("已入账比例(%)")
+    @ColumnWidth(20)
+    private BigDecimal paidRatio;
+
     @ExcelProperty("待入账金额(HKD)")
     @ExcelProperty("待入账金额(HKD)")
     @ColumnWidth(20)
     @ColumnWidth(20)
     private BigDecimal pendingAmount;
     private BigDecimal pendingAmount;
 
 
+    @ExcelProperty("待入账比例(%)")
+    @ColumnWidth(20)
+    private BigDecimal pendingRatio;
+
     @ExcelProperty("备注")
     @ExcelProperty("备注")
     @ColumnWidth(30)
     @ColumnWidth(30)
     private String remark;
     private String remark;
@@ -108,12 +117,22 @@ public class CommissionExpectedExportDTO {
         dto.setStatus(getStatusText(vo.getStatus()));
         dto.setStatus(getStatusText(vo.getStatus()));
         dto.setExpectedAmount(vo.getExpectedAmount());
         dto.setExpectedAmount(vo.getExpectedAmount());
         dto.setPaidAmount(vo.getPaidAmount());
         dto.setPaidAmount(vo.getPaidAmount());
-
-        // 计算待入账金额
-        BigDecimal pendingAmount = vo.getExpectedAmount() != null && vo.getPaidAmount() != null
-                ? vo.getExpectedAmount().subtract(vo.getPaidAmount())
-                : BigDecimal.ZERO;
-        dto.setPendingAmount(pendingAmount);
+        dto.setPaidRatio(vo.getPaidRatio());
+
+        BigDecimal paidAmount1 = ObjectUtils.defaultIfNull(vo.getPaidAmount(), BigDecimal.ZERO);
+        BigDecimal paidRatio1 = ObjectUtils.defaultIfNull(vo.getPaidRatio(), BigDecimal.ZERO);
+        // 待入账比例、待入账金额
+        if (vo.getCommissionRatio() != null) {
+            dto.setPaidRatio(paidRatio1);
+            dto.setPendingRatio(vo.getCommissionRatio().subtract(paidRatio1));
+            if (vo.getExpectedAmount() != null) {
+                dto.setPaidAmount(paidAmount1);
+                dto.setPendingAmount(vo.getExpectedAmount().subtract(paidAmount1));
+            }
+        } else if (vo.getAmount() != null) {
+            dto.setPaidAmount(paidAmount1);
+            dto.setPendingAmount(vo.getAmount().subtract(paidAmount1));
+        }
 
 
         dto.setRemark(vo.getRemark());
         dto.setRemark(vo.getRemark());
         dto.setCreateTime(vo.getCreateTime());
         dto.setCreateTime(vo.getCreateTime());