物流处理 完成了顺丰api对接

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaExpress.java

@@ -0,0 +1,98 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 物流预览对象 oa_express
+ *
+ * @author hdka
+ * @date 2025-07-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_express")
+public class OaExpress extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "express_id")
+    private Long expressId;
+
+    /**
+     * 绑定项目
+     */
+    private Long projectId;
+
+    /**
+     * 发货记录id
+     */
+    private Long detailId;
+
+    /**
+     * 物流编号
+     */
+    private String expressCode;
+    /**
+     * 数据状态0未确认1进行中2已完成
+     */
+    private Long status;
+    /**
+     * 供应商姓名
+     */
+    private String supplyName;
+    /**
+     * 供应商联系方式
+     */
+    private String supplyPhone;
+    /**
+     * 负责人id
+     */
+    private Long ownerId;
+    /**
+     * 负责人手机号（快递手机号）
+     */
+    private String ownerPhone;
+    /**
+     * 计划到货时间
+     */
+    private Date planDate;
+    /**
+     * 物流公司标识
+     */
+    private String expressType;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+    /**
+     * 节点变化时间
+     */
+    private Date lastUpdateTime;
+
+    /**
+     * 当前节点
+     */
+    private String lastStatus;
+
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/OaExpressQuestion.java

@@ -0,0 +1,62 @@
+package com.ruoyi.oa.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import java.io.Serializable;
+import java.util.Date;
+import java.math.BigDecimal;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 快递问题对象 oa_express_question
+ *
+ * @author hdka
+ * @date 2025-07-21
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("oa_express_question")
+public class OaExpressQuestion extends BaseEntity {
+
+    private static final long serialVersionUID=1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "question_id")
+    private Long questionId;
+    /**
+     * 关联快递
+     */
+    private Long expressId;
+    /**
+     * 问题描述
+     */
+    private String description;
+    /**
+     * 汇报时间
+     */
+    private Date reportTime;
+    /**
+     * 汇报人
+     */
+    private String reportBy;
+    /**
+     * 0未解决1已解决
+     */
+    private Long status;
+    /**
+     * 删除标志
+     */
+    @TableLogic
+    private Long delFlag;
+    /**
+     * 备注
+     */
+    private String remark;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaExpressBo.java

@@ -0,0 +1,97 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 物流预览业务对象 oa_express
+ *
+ * @author hdka
+ * @date 2025-07-20
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaExpressBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long expressId;
+
+    /**
+     * 物流编号
+     */
+    private String expressCode;
+
+    /**
+     * 数据状态0未确认1进行中2已完成
+     */
+    private Long status;
+
+    /**
+     * 供应商姓名
+     */
+    private String supplyName;
+
+    /**
+     * 供应商联系方式
+     */
+    private String supplyPhone;
+
+    /**
+     * 负责人id
+     */
+    private Long ownerId;
+
+    /**
+     * 负责人手机号（快递手机号）
+     */
+    private String ownerPhone;
+
+    /**
+     * 计划到货时间
+     */
+    private Date planDate;
+
+    /**
+     * 物流公司标识
+     */
+    private String expressType;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 绑定项目
+     */
+    private Long projectId;
+
+    /**
+     * 发货记录id
+     */
+    private Long detailId;
+
+
+    /**
+     * 节点变化时间
+     */
+    private Date lastUpdateTime;
+
+    /**
+     * 当前节点
+     */
+    private String lastStatus;
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/OaExpressQuestionBo.java

@@ -0,0 +1,63 @@
+package com.ruoyi.oa.domain.bo;
+
+import com.ruoyi.common.core.validate.AddGroup;
+import com.ruoyi.common.core.validate.EditGroup;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import javax.validation.constraints.*;
+
+import java.util.Date;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
+
+/**
+ * 快递问题业务对象 oa_express_question
+ *
+ * @author hdka
+ * @date 2025-07-21
+ */
+
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class OaExpressQuestionBo extends BaseEntity {
+
+    /**
+     * 主键id
+     */
+    private Long questionId;
+
+    /**
+     * 关联快递
+     */
+    private Long expressId;
+
+    /**
+     * 问题描述
+     */
+    private String description;
+
+    /**
+     * 汇报时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date reportTime;
+
+    /**
+     * 汇报人
+     */
+    private String reportBy;
+
+    /**
+     * 0未解决1已解决
+     */
+    private Long status;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaExpressQuestionVo.java

@@ -0,0 +1,74 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 快递问题视图对象 oa_express_question
+ *
+ * @author hdka
+ * @date 2025-07-21
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaExpressQuestionVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long questionId;
+
+    /**
+     * 关联快递
+     */
+    @ExcelProperty(value = "关联快递")
+    private Long expressId;
+
+    /**
+     * 问题描述
+     */
+    @ExcelProperty(value = "问题描述")
+    private String description;
+
+    /**
+     * 汇报时间
+     */
+    @ExcelProperty(value = "汇报时间")
+    private Date reportTime;
+
+    /**
+     * 汇报人
+     */
+    @ExcelProperty(value = "汇报人")
+    private String reportBy;
+
+    /**
+     * 0未解决1已解决
+     */
+    @ExcelProperty(value = "状态")
+    private Long status;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 快递单号
+     */
+    private String expressCode;
+
+
+}

ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/OaExpressVo.java

@@ -0,0 +1,140 @@
+package com.ruoyi.oa.domain.vo;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.ruoyi.common.annotation.ExcelDictFormat;
+import com.ruoyi.common.convert.ExcelDictConvert;
+import lombok.Data;
+import java.util.Date;
+
+
+
+/**
+ * 物流预览视图对象 oa_express
+ *
+ * @author hdka
+ * @date 2025-07-20
+ */
+@Data
+@ExcelIgnoreUnannotated
+public class OaExpressVo {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @ExcelProperty(value = "主键id")
+    private Long expressId;
+
+    /**
+     * 物流编号
+     */
+    @ExcelProperty(value = "物流编号")
+    private String expressCode;
+
+    /**
+     * 数据状态0未确认1进行中2已完成
+     */
+    @ExcelProperty(value = "数据状态0未确认1进行中2已完成")
+    private Long status;
+
+    /**
+     * 供应商姓名
+     */
+    @ExcelProperty(value = "供应商姓名")
+    private String supplyName;
+
+    /**
+     * 供应商联系方式
+     */
+    @ExcelProperty(value = "供应商联系方式")
+    private String supplyPhone;
+
+    /**
+     * 负责人id
+     */
+    private Long ownerId;
+
+
+    /**
+     * 负责人id
+     */
+    @ExcelProperty(value = "负责人")
+    private String ownerName;
+
+    /**
+     * 负责人手机号（快递手机号）
+     */
+    @ExcelProperty(value = "负责人手机号", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(readConverterExp = "快=递手机号")
+    private String ownerPhone;
+
+    /**
+     * 计划到货时间
+     */
+    @ExcelProperty(value = "计划到货时间")
+    private Date planDate;
+
+    /**
+     * 物流公司标识
+     */
+    @ExcelProperty(value = "物流公司标识", converter = ExcelDictConvert.class)
+    @ExcelDictFormat(dictType = "oa_express_type")
+    private String expressType;
+
+    /**
+     * 备注
+     */
+    @ExcelProperty(value = "备注")
+    private String remark;
+
+    /**
+     * 接收时间
+     */
+    private Date acceptTime;
+
+    /**
+     * 物流状态
+     */
+    private String firstStatusName;
+
+
+
+    /**
+     * 绑定项目
+     */
+    private Long projectId;
+
+    /**
+     * 发货记录id
+     */
+    private Long detailId;
+
+    /**
+     * 发货记录细节
+     */
+    private String detailName;
+
+    /**
+     * 项目名称
+     */
+    private String projectName;
+
+    /**
+     * 节点变化时间
+     */
+    private Date lastUpdateTime;
+
+    /**
+     * 当前节点
+     */
+    private String lastStatus;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+}