fix: 运单、地址簿导出修改；

jd-logistics-modules/jd-logistics-file/src/main/java/com/ruoyi/file/controller/SysFileController.java

@@ -48,6 +48,11 @@ public class SysFileController
         }
     }
 
+    /**
+     * 文件下载
+     * @param fileName
+     * @return
+     */
     @GetMapping("download")
     public R<String> download(@RequestParam("fileName") String fileName) {
         String base64Data = sysFileService.getObsFile(fileName);

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

@@ -47,15 +47,15 @@ public class BizAddressBook extends BaseEntity
     private String detailedAddress;
 
     /** 是否默认 0非默认1默认 */
-    @Excel(name = "是否默认 0非默认1默认")
+    @Excel(name = "是否默认", readConverterExp = "0=非默认,1=默认")
     private String defaultFlag;
 
     /** 部门ID */
-    @Excel(name = "部门ID")
+//    @Excel(name = "部门ID")
     private Long deptId;
 
     /** 用户ID */
-    @Excel(name = "用户ID")
+//    @Excel(name = "用户ID")
     private Long userId;
 
     /** 删除标志（0代表存在 2代表删除） */

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

@@ -3,6 +3,10 @@ package com.ruoyi.logistics.domain;
 import java.math.BigDecimal;
 import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.annotation.Excels;
+import com.ruoyi.logistics.annotation.Dict;
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.api.domain.SysUser;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -22,15 +26,15 @@ public class BizWaybillOrder extends BaseEntity
     private Long waybillId;
 
     /** 运单号 内部生成 */
-    @Excel(name = "运单号 内部生成")
+    @Excel(name = "运单号")
     private String waybillNo;
 
     /** 外部运单号 JD/SF的运单号 */
-    @Excel(name = "外部运单号 JD/SF的运单号")
+    @Excel(name = "外部运单号")
     private String externalWaybillNo;
 
     /** 订单类型 1-非时效件(京东)，2-时效件(顺丰) */
-    @Excel(name = "订单类型 1-非时效件(京东)，2-时效件(顺丰)")
+    @Excel(name = "订单类型", readConverterExp = "1=京东,2=顺丰")
     private Integer orderType;
 
     /** 发件人姓名 */
@@ -98,36 +102,36 @@ public class BizWaybillOrder extends BaseEntity
     private Long goodsQty;
 
     /** 订单状态 */
-    @Excel(name = "订单状态")
+    @Excel(name = "订单状态", readConverterExp = "1=待揽件,2=已揽件,3=运输中,4=派送中,5=已签收,6=已取消")
     private Integer orderStatus;
 
     /** 取件类型 */
-    @Excel(name = "取件类型")
+    @Excel(name = "取件类型", readConverterExp = "1=上门取件,2=自提")
     private Integer pickupType;
 
     /** 上门取件开始时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上门取件开始时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "上门取件开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date sendStartTime;
 
     /** 上门取件结束时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上门取件结束时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "上门取件结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date sendEndTime;
 
     /** 揽收时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "揽收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "揽收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date pickupTime;
 
     /** 派送时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "派送时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "派送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date deliveryTime;
 
     /** 签收时间 */
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd")
+    @Excel(name = "签收时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
     private Date signTime;
 
     /** 取消原因 */
@@ -150,13 +154,19 @@ public class BizWaybillOrder extends BaseEntity
     private String delFlag;
 
     /** 部门ID */
-    @Excel(name = "部门ID")
+//    @Excel(name = "部门ID")
     private Long deptId;
 
+    @Excel(name = "部门名称")
+    private String deptName;
+
     /** 用户ID */
-    @Excel(name = "用户ID")
+//    @Excel(name = "用户ID")
     private Long userId;
 
+    @Excel(name = "用户昵称")
+    private String nickName;
+
     /** 产品类型 */
     @Excel(name = "产品类型")
     private String productCode;
@@ -518,6 +528,22 @@ public class BizWaybillOrder extends BaseEntity
         this.addedService = addedService;
     }
 
+    public String getDeptName() {
+        return deptName;
+    }
+
+    public void setDeptName(String deptName) {
+        this.deptName = deptName;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
+    }
+
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillOrderServiceImpl.java

@@ -98,6 +98,7 @@ public class BizWaybillOrderServiceImpl implements IBizWaybillOrderService
                 }
             }
         }
+        bizWaybillOrder.setPickupType(1);
         bizWaybillOrder.setCreateTime(DateUtils.getNowDate());
         bizWaybillOrder.setUserId(loginUser.getUserid());
         bizWaybillOrder.setDeptId(loginUser.getSysUser().getDeptId());

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

@@ -46,13 +46,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userId"    column="user_id"    />
         <result property="productCode"    column="product_code"    />
         <result property="addedService"    column="added_service"    />
+        <result property="nickName"    column="nick_name"    />
+        <result property="deptName"    column="dept_name"    />
     </resultMap>
 
     <sql id="selectBizWaybillOrderVo">
         select bwo.waybill_id, bwo.waybill_no, bwo.external_waybill_no, bwo.order_type, bwo.sender_name, bwo.sender_phone, bwo.sender_province, bwo.sender_city, bwo.sender_county, bwo.sender_address, bwo.receiver_name,
                bwo.receiver_phone, bwo.receiver_province, bwo.receiver_city, bwo.receiver_county, bwo.receiver_address, bwo.goods_name, bwo.goods_weight, bwo.goods_volume, bwo.goods_qty, bwo.order_status, bwo.pickup_type,
                bwo.send_start_time, bwo.send_end_time, bwo.pickup_time, bwo.delivery_time, bwo.sign_time, bwo.cancel_reason, bwo.parent_waybill_id, bwo.invoice_flag, bwo.adjust_flag, bwo.remark, bwo.create_time, bwo.update_time,
-               bwo.del_flag, bwo.create_by, bwo.update_by, bwo.dept_id, bwo.user_id, bwo.product_code, bwo.added_service
+               bwo.del_flag, bwo.create_by, bwo.update_by, bwo.dept_id, bwo.user_id, bwo.product_code, bwo.added_service, u.nick_name, d.dept_name
         from biz_waybill_order bwo
                  left join sys_user u on bwo.user_id = u.user_id
                  left join sys_dept d on bwo.dept_id = d.dept_id