feat:增加企业微信消息提醒

wlzboy

6 天以前 09e6dc3fb7266620fafb5e341808a8eb36e080a1

 ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java

@@ -108,8 +108,15 @@
    @Excel(name = "部门名称")
    private String deptName;

    /** 车牌号(列表显示第一辆车) */
    @Excel(name = "车牌号")
    private String vehicleNo;

    /** 删除标志（0代表存在 2代表删除） */
    private String delFlag;

    /** 旧系统同步标记：0-未同步，1-已同步 */
    private Integer legacySynced;

    /** 关联车辆列表 */
    private List<SysTaskVehicle> assignedVehicles;
@@ -119,6 +126,37 @@

    /** 操作日志列表 */
    private List<SysTaskLog> operationLogs;

    /** 执行人员列表 */
    private List<SysTaskAssignee> assignees;

    /** 急救转运扩展信息 */
    private SysTaskEmergency emergencyInfo;

    /** 福祉车扩展信息 */
    private SysTaskWelfare welfareInfo;

    private String showTaskCode;
    public void setShowTaskCode(String showTaskCode) {
         showTaskCode=this.showTaskCode;
    }
    /**
     * 获取显示任务编号，优先返回急救转运的调度单编号，其次是服务单编号，最后是任务编号
     */
    public String getShowTaskCode(){

        if(this.emergencyInfo!=null){
            String dispatchOrdCode=this.emergencyInfo.getDispatchCode();
            if(dispatchOrdCode!=null){
                return dispatchOrdCode;
            }
            String serviceOrdCode=this.emergencyInfo.getServiceCode();
            if(serviceOrdCode!=null){
                return serviceOrdCode;
            }
        }
        return this.taskCode;
    }

    public void setTaskId(Long taskId) {
        this.taskId = taskId;
@@ -296,12 +334,28 @@
        return deptName;
    }

    public void setVehicleNo(String vehicleNo) {
        this.vehicleNo = vehicleNo;
    }

    public String getVehicleNo() {
        return vehicleNo;
    }

    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }

    public String getDelFlag() {
        return delFlag;
    }

    public void setLegacySynced(Integer legacySynced) {
        this.legacySynced = legacySynced;
    }

    public Integer getLegacySynced() {
        return legacySynced;
    }

    public void setAssignedVehicles(List<SysTaskVehicle> assignedVehicles) {
@@ -328,6 +382,30 @@
        return operationLogs;
    }

    public void setEmergencyInfo(SysTaskEmergency emergencyInfo) {
        this.emergencyInfo = emergencyInfo;
    }

    public SysTaskEmergency getEmergencyInfo() {
        return emergencyInfo;
    }

    public void setWelfareInfo(SysTaskWelfare welfareInfo) {
        this.welfareInfo = welfareInfo;
    }

    public SysTaskWelfare getWelfareInfo() {
        return welfareInfo;
    }

    public void setAssignees(List<SysTaskAssignee> assignees) {
        this.assignees = assignees;
    }

    public List<SysTaskAssignee> getAssignees() {
        return assignees;
    }

    /**
     * 判断是否可以变更状态
     */
@@ -340,15 +418,34 @@
        // 状态流转规则
        switch (currentStatus) {
            case PENDING:
                return newStatus == TaskStatus.IN_PROGRESS || newStatus == TaskStatus.CANCELLED;
                // 待处理 -> 出发中、已取消
                return newStatus == TaskStatus.DEPARTING || newStatus == TaskStatus.CANCELLED;
            case DEPARTING:
                // 出发中 -> 已到达、已取消
                return newStatus == TaskStatus.ARRIVED || newStatus == TaskStatus.CANCELLED;
            case ARRIVED:
                // 已到达 -> 返程中
                return newStatus == TaskStatus.RETURNING;
            case RETURNING:
                // 返程中 -> 已完成
                return newStatus == TaskStatus.COMPLETED;
            case IN_PROGRESS:
                // 兼容旧数据：任务中 -> 已完成、已取消、待处理
                return newStatus == TaskStatus.COMPLETED || newStatus == TaskStatus.CANCELLED || newStatus == TaskStatus.PENDING;
            case COMPLETED:
            case CANCELLED:
                // 已完成、已取消 -> 不允许任何状态变更
                return false;
            default:
                return false;
        }
    }

    public void setPlanedStartTime(Date plannedStartTime) {
        this.plannedStartTime = plannedStartTime;
    }
    public Date getPlanedStartTime() {
        return plannedStartTime;
    }

    /**
@@ -426,4 +523,4 @@
                ", deptName='" + deptName + '\'' +
                '}';
    }
}
}