caozj 1 рік тому
батько
коміт
2f6b931b87

+ 5 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/contract/vo/ContractInvoiceVo.java

@@ -24,4 +24,9 @@ public class ContractInvoiceVo extends ContractInvoice {
      * 合同号多个
      */
     private String contractCodes;
+
+    /**
+     * 用户名
+     */
+    private String userName;
 }

+ 4 - 0
hx-sale/src/main/java/com/fjhx/sale/service/contract/impl/ContractInvoiceServiceImpl.java

@@ -13,15 +13,18 @@ import com.fjhx.purchase.entity.invoice.vo.InvoiceVo;
 import com.fjhx.sale.entity.contract.po.ContractInvoice;
 import com.fjhx.sale.entity.contract.po.ContractInvoiceDetails;
 import com.fjhx.sale.entity.contract.vo.ContractInvoiceDetailsVo;
+import com.fjhx.sale.entity.serviceContract.vo.ServiceContractRecordVo;
 import com.fjhx.sale.mapper.contract.ContractInvoiceMapper;
 import com.fjhx.sale.service.contract.ContractInvoiceDetailsService;
 import com.fjhx.sale.service.contract.ContractInvoiceService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.common.annotation.LogicIgnore;
 import com.ruoyi.common.annotation.TenantIgnore;
+import com.ruoyi.common.core.domain.BasePo;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.wrapper.SqlField;
+import com.ruoyi.system.utils.UserUtil;
 import lombok.experimental.Delegate;
 import org.apache.commons.collections4.MapUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,6 +81,7 @@ public class ContractInvoiceServiceImpl extends ServiceImpl<ContractInvoiceMappe
             customerService.attributeAssign(list, ContractInvoiceVo::getCustomerId, (item, customer) -> {
                 item.setCustomerName(customer.getName());
             });
+            UserUtil.assignmentNickName(list, BasePo::getCreateUser, ContractInvoiceVo::setUserName);
         }
         return page;
     }