仓库业务->修改利润总帐 导出excel 添加业务员

ruoyi-warehouse/src/main/java/com/ruoyi/reportManagement/excel/Profit.java

@@ -17,8 +17,8 @@ public class Profit {
     /**
      * 客户名称，t_corps 中的no或 name，模糊查找选择后，存储id，显示name
      */
-    @Excel(name = "货权方")
-    private String fName;
+    @Excel(name = "业务员")
+    private String fSalesmanName;
 
     /**
      * 入（出）库日期
@@ -69,12 +69,12 @@ public class Profit {
     @Excel(name = "利润")
     private Double nnfinished;
 
-    public String getfName() {
-        return fName;
+    public String getfSalesmanName() {
+        return fSalesmanName;
     }
 
-    public void setfName(String fName) {
-        this.fName = fName;
+    public void setfSalesmanName(String fSalesmanName) {
+        this.fSalesmanName = fSalesmanName;
     }
 
     public String getfFeesName() {

ruoyi-warehouse/src/main/resources/mapper/finance/TFeeMapper.xml

@@ -1799,6 +1799,7 @@
             c1.f_name AS fFeesName,
             w.f_mblno AS fMblno,
             w.f_product_name AS fProductName,
+            u1.user_name AS fSalesmanName,
             w.f_marks AS fMarks,
             t.f_billtype AS fBilltype,
             w.f_review_date AS fReviewDate,
@@ -1810,6 +1811,7 @@
             t_warehousebillsfees w
             LEFT JOIN t_warehousebills t ON t.f_id = w.f_pid
             left join sys_user u on t.create_by = u.user_name
+            left join sys_user u1 on t.f_salesman_id = u1.user_id
             left join sys_dept d on t.f_bsdeptid = d.dept_id
             LEFT JOIN t_corps c ON c.f_id = t.f_corpid
             LEFT JOIN t_corps c1 ON c1.f_id = w.f_corpid