利润结算表扩展

hx-account/src/main/java/com/fjhx/account/entity/account/vo/AccountRequestFundsDetailVo.java

@@ -30,4 +30,9 @@ public class AccountRequestFundsDetailVo extends AccountRequestFundsDetail {
      * 汇率
      */
     private BigDecimal rate;
+
+    /**
+     * 操作人
+     */
+    private String userName;
 }

hx-account/src/main/java/com/fjhx/account/entity/tax/po/TaxRefundDetails.java

@@ -47,4 +47,10 @@ public class TaxRefundDetails extends BasePo {
      */
     @TableField(exist = false)
     private String currency;
+
+    /**
+     * 操作人
+     */
+    @TableField(exist = false)
+    private String userName;
 }

hx-sale/src/main/java/com/fjhx/sale/entity/claim/po/ClaimContract.java

@@ -56,4 +56,10 @@ public class ClaimContract extends BasePo {
      */
     @TableField(exist = false)
     private BigDecimal rate;
+
+    /**
+     * 操作人
+     */
+    @TableField(exist = false)
+    private String userName;
 }

hx-sale/src/main/java/com/fjhx/sale/service/statement/impl/SaleStatementServiceImpl.java

@@ -307,6 +307,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                         return rate.multiply(money);
                     }).reduce(BigDecimal.ZERO, BigDecimal::add);
                     p.setContractArrival(contractArrival);
+                    // 赋值业务员名称
+                    UserUtil.assignmentNickName(cList, ClaimContract::getCreateUser, ClaimContract::setUserName);
                     p.setClaimList(cList);
                 }
                 /**
@@ -323,6 +325,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                         return rate.multiply(money);
                     }).reduce(BigDecimal.ZERO, BigDecimal::add);
                     p.setTaxReturnMoney(taxReturnMoney);
+                    // 赋值业务员名称
+                    UserUtil.assignmentNickName(rList, TaxRefundDetails::getCreateUser, TaxRefundDetails::setUserName);
                     p.setTaxReturnList(rList);
                 }
                 /**
@@ -356,6 +360,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                             return rate.multiply(money);
                         }).reduce(BigDecimal.ZERO, BigDecimal::add);
                         p.setPayForGoods(payAmount);
+                        // 赋值业务员名称
+                        UserUtil.assignmentNickName(payList, Pay::getCreateUser, Pay::setUserName);
                         p.setPayList(payList);
                     }
                 }
@@ -373,6 +379,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                         return rate.multiply(money);
                     }).reduce(BigDecimal.ZERO, BigDecimal::add);
                     p.setOtherExpenses(otherExpenses);
+                    // 赋值业务员名称
+                    UserUtil.assignmentNickName(accountRequestFundsDetailVos, AccountRequestFundsDetailVo::getCreateUser, AccountRequestFundsDetailVo::setUserName);
                     p.setAccountRequestFundsDetailList(accountRequestFundsDetailVos);
                 }
             } else {//取数据汇率
@@ -394,6 +402,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                         return rate.multiply(money);
                     }).reduce(BigDecimal.ZERO, BigDecimal::add);
                     p.setContractArrival(contractArrival);
+                    // 赋值业务员名称
+                    UserUtil.assignmentNickName(cList, ClaimContract::getCreateUser, ClaimContract::setUserName);
                     p.setClaimList(cList);
                 }
                 /**
@@ -410,6 +420,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                         return rate.multiply(money);
                     }).reduce(BigDecimal.ZERO, BigDecimal::add);
                     p.setTaxReturnMoney(taxReturnMoney);
+                    // 赋值业务员名称
+                    UserUtil.assignmentNickName(rList, TaxRefundDetails::getCreateUser, TaxRefundDetails::setUserName);
                     p.setTaxReturnList(rList);
                 }
                 /**
@@ -443,6 +455,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                             return rate.multiply(money);
                         }).reduce(BigDecimal.ZERO, BigDecimal::add);
                         p.setPayForGoods(payAmount);
+                        // 赋值业务员名称
+                        UserUtil.assignmentNickName(payList, Pay::getCreateUser, Pay::setUserName);
                         p.setPayList(payList);
                     }
                 }
@@ -460,6 +474,8 @@ public class SaleStatementServiceImpl implements SaleStatementService {
                         return rate.multiply(money);
                     }).reduce(BigDecimal.ZERO, BigDecimal::add);
                     p.setOtherExpenses(otherExpenses);
+                    // 赋值业务员名称
+                    UserUtil.assignmentNickName(accountRequestFundsDetailVos, AccountRequestFundsDetailVo::getCreateUser, AccountRequestFundsDetailVo::setUserName);
                     p.setAccountRequestFundsDetailList(accountRequestFundsDetailVos);
                 }
             }