墙盒申请的导出字段以明文的形式展示

2acb5e6d · zhangqiliang · e87eddbd · 2acb5e6d · 2acb5e6d · 2acb5e6d
--- a/src/main/java/com/boco/nbd/wios/export/Contants.java
+++ b/src/main/java/com/boco/nbd/wios/export/Contants.java
@@ -101,5 +101,5 @@ public class Contants {
    public static final String export_wallBox_title = "序号,申请团队,安装订单号,安装单最近状态,区域,是否特殊申请,审核状态,物流状态,剩余时间,超时类型,数量,申请时间";
    public static final String export_wallBox_field =
-            "id,supplierTeam,orderId,installStatus,regionName,ifEmergency,checkStatus,logisticsStatus,timeRemaining,ifTimeout,number,createdTime";
+            "id,supplierTeam,orderId,installStatusName,regionName,ifEmergencyName,checkStatusName,trackingStatusName,timeRemaining,ifTimeoutName,number,createdTime";
 }
--- a/src/main/java/com/boco/nbd/wios/export/impl/WallBoxExport.java
+++ b/src/main/java/com/boco/nbd/wios/export/impl/WallBoxExport.java
@@ -5,6 +5,7 @@ import com.boco.nbd.wios.manage.convert.WallboxApplyConvert;
 import com.boco.nbd.wios.manage.entity.bo.SupplierBo;
 import com.boco.nbd.wios.manage.entity.bo.SupplierVo;
 import com.boco.nbd.wios.manage.entity.bo.WallboxApply;
+import com.boco.nbd.wios.manage.entity.cams.enums.OrderStatus;
 import com.boco.nbd.wios.manage.entity.vo.WallboxApplyInstallListVO;
 import com.boco.nbd.wios.manage.entity.vo.WallboxApplyReqVO;
 import com.boco.nbd.wios.manage.mapper.def.WallboxApplyMapper;
@@ -14,6 +15,7 @@ import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -46,19 +48,22 @@ public class WallBoxExport implements Export<WallboxApplyInstallListVO> {
            Date createdDate = apply.getCreatedTime();
            LocalDateTime createdTime = LocalDateTime.ofInstant(createdDate.toInstant(), ZoneId.systemDefault());
            LocalDateTime endTime = createdTime.plusHours(24);
            long remainingHours = currentTime.until(endTime, ChronoUnit.HOURS);
            remainingHours = Math.max(remainingHours, 0);  // 将剩余小时数限制在0-24之间
            if (remainingHours == 0) {
                apply.setIfTimeout(1L);
+                apply.setIfTimeoutName("已超时");
            } else {
                apply.setIfTimeout(0L);
+                apply.setIfTimeoutName("未超时");
            }
            apply.setTimeRemaining(Long.toString(remainingHours));
-        }
+            Long no = 1L;
-        Long no = 1L;
+            apply.setId(no++);
-        for (WallboxApplyInstallListVO vo : list) {
+            apply.setNumber("1");
-            vo.setId(no++);
+            if (!StringUtils.isEmpty(apply.getInstallStatus())){
+                apply.setInstallStatusName(OrderStatus.getText(Integer.parseInt(apply.getInstallStatus())));
+            }
        }
        return list;
    }

--- a/src/main/java/com/boco/nbd/wios/manage/entity/vo/WallboxApplyInstallInfoVO.java
+++ b/src/main/java/com/boco/nbd/wios/manage/entity/vo/WallboxApplyInstallInfoVO.java
@@ -97,6 +97,13 @@ public class WallboxApplyInstallInfoVO {
     */
    @ApiModelProperty(value = "墙盒品牌名称")
    private String wallboxModelName;
+    /**
+     * 物流状态0未发货，1已发货
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "物流状态0未发货，1已发货")
+    private String trackingStatus;
 }
--- a/src/main/java/com/boco/nbd/wios/manage/entity/vo/WallboxApplyInstallListVO.java
+++ b/src/main/java/com/boco/nbd/wios/manage/entity/vo/WallboxApplyInstallListVO.java
 package com.boco.nbd.wios.manage.entity.vo;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -26,6 +27,8 @@ public class WallboxApplyInstallListVO {
    @ApiModelProperty(value = "安装状态")
    private String installStatus;
+    @ApiModelProperty(value = "安装状态名称")
+    private String installStatusName;
    /** 安装服务商id */
    @ApiModelProperty(value = "安装服务商id")
@@ -63,14 +66,23 @@ public class WallboxApplyInstallListVO {
    /** 是否紧急：0：否，1：是 */
    @ApiModelProperty(value = "是否特殊申请")
    private Integer ifEmergency;
+    /** 是否紧急：0：否，1：是 */
+    @ApiModelProperty(value = "是否特殊申请")
+    private String ifEmergencyName;
    /** 是否超时:0：未超时，1：已超时 */
    @ApiModelProperty(value = "超时类型")
    private Long ifTimeout;
+    /** 是否超时:0：未超时，1：已超时 */
+    @ApiModelProperty(value = "超时类型")
+    private String ifTimeoutName;
    /** 申请状态：0：已申请，1：已通过，2：已驳回，3：已关闭 */
    @ApiModelProperty(value = "申请状态")
    private Long checkStatus;
+    /** 申请状态：0：已申请，1：已通过，2：已驳回，3：已关闭 */
+    @ApiModelProperty(value = "申请状态名称")
+    private String checkStatusName;
    /** 创建时间 */
    @ApiModelProperty(value = "申请时间")
@@ -128,6 +140,13 @@ public class WallboxApplyInstallListVO {
    @ApiModelProperty(value = "物流状态0未发货，1已发货")
    private String trackingStatus;
    /**
+     * 物流状态名称
+     *
+     * @mbg.generated
+     */
+    @ApiModelProperty(value = "物流状态名称")
+    private String trackingStatusName;
+    /**
     * 所属区域
     *
     * @mbg.generated

--- a/src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml
+++ b/src/main/resources/mybatis/mapper/def/common/WallboxApplyMapper.xml
@@ -104,14 +104,28 @@
        t_wallbox_apply.wallbox_model,
        t_wallbox_apply.material_type,
        t_wallbox_apply.tracking_status,
+        case
+        when t_wallbox_apply.tracking_status = 0 then '未发货'
+        when t_wallbox_apply.tracking_status = 1 then '已发货'
+        else null end trackingStatusName,
        t_order.region_id,
        reg.name as region_name,
        t_order.address,
        t_wallbox_apply.out_order_id,
        t_wallbox_apply.if_emergency,
+        case
+            when t_wallbox_apply.if_emergency = 1 then '是'
+            when t_wallbox_apply.if_emergency = 0 then '否'
+                else null end ifEmergencyName,
        t_wallbox_apply.if_timeout,
        t_wallbox_apply.check_account,
        t_wallbox_apply.check_status,
+        case
+        when t_wallbox_apply.check_status = 1 then '已申请'
+        when t_wallbox_apply.check_status = 2 then '已通过'
+        when t_wallbox_apply.check_status = 3 then '已驳回'
+        when t_wallbox_apply.check_status = 4 then '已关闭'
+        else null end checkStatusName,
        t_wallbox_apply.check_remarks,
        t_wallbox_apply.check_time,
        t_wallbox_apply.install_reserve_time,