导出新增创建人所属组织相关信息

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/BizWaybillCostDetails.java

@@ -96,13 +96,15 @@ public class BizWaybillCostDetails extends BaseEntity
 
 
 
-    /** 寄件地区 */
 
-    /** 经手人 */
-   // @Excel(name = "经手人")
+    @Excel(name = "创建人")
     private String userName;
 
+    @Excel(name = "经手人")
+    private String  nickName;
 
+    @Excel(name = "创建人所属组织")
+    private String  deptName;
     private String adjustmentType;
 
     @Excel(name = "账单月份")//
@@ -111,6 +113,7 @@ public class BizWaybillCostDetails extends BaseEntity
     private String  adjustmentReason;
 
 
+
     public void setProductName(String productName) {
         this.productName = productName;
     }
@@ -340,6 +343,22 @@ public class BizWaybillCostDetails extends BaseEntity
         this.purchaseAmount = purchaseAmount;
     }
 
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public String getDeptName() {
+        return deptName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizWaybillCostDetailsMapper.xml

@@ -32,6 +32,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="productCode"    column="product_code"    />
         <result property="productName"    column="product_name"    />
         <result property="userName"    column="user_name"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="deptName"    column="dept_name"    />
         <result property="summaryMonth"    column="summaryMonth"    />
 
 
@@ -48,6 +50,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             b.receiver_city,
             b.goods_weight,
             b.order_type,
+            d.dept_name,
             CASE b.order_type
         WHEN 1 THEN (SELECT dict_label	FROM sys_dict_data WHERE dict_type = 'jd_logistics_product_code' AND dict_value = b.product_code LIMIT 1)
         WHEN 2 THEN (SELECT dict_label FROM sys_dict_data WHERE dict_type = 'sf_logistics_product_code' AND dict_value = b.product_code LIMIT 1)
@@ -69,7 +72,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.dept_id,
             a.del_flag,
             a.create_by,
-            a.update_by,u.nick_name  user_name
+            a.update_by,u.user_name
         FROM
             biz_waybill_cost_details a
                 LEFT JOIN biz_waybill_order b ON a.waybill_id = b.waybill_id