feat:优先添加执行人

wlzboy

2025-12-03 656d6f8029f8bf9b2daa9dcc89101a879a70b860

 ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/TaskUpdateVO.java

@@ -1,523 +1,24 @@
package com.ruoyi.system.domain.vo;

import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import lombok.EqualsAndHashCode;

/**
 * 任务更新对象
 * 任务更新对象（继承自TaskCreateVO）
 * 
 * @author ruoyi
 * @date 2024-01-15
 */
public class TaskUpdateVO {
@Data
@EqualsAndHashCode(callSuper = true)
public class TaskUpdateVO extends TaskCreateVO {
    
    /** 任务ID */
    /** 任务ID（必填，用于更新指定任务） */
    private Long taskId;

    /** 任务描述 */
    private String taskDescription;

    /** 出发地址 */
    private String departureAddress;

    /** 目的地址 */
    private String destinationAddress;

    /** 计划开始时间 */
    
    /** 更新时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date plannedStartTime;

    /** 计划结束时间 */
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date plannedEndTime;

    /** 执行人ID */
    private Long assigneeId;

    /** 备注 */
    private String remark;

    /** 出发地经度 */
    private BigDecimal departureLongitude;

    /** 出发地纬度 */
    private BigDecimal departureLatitude;

    /** 目的地经度 */
    private BigDecimal destinationLongitude;

    /** 目的地纬度 */
    private BigDecimal destinationLatitude;

    /** 任务类型 */
    private String taskType;

    /** 部门ID */
    private Long deptId;

    /** 车辆ID列表 */
    private List<Long> vehicleIds;

    /** 病情ID列表（用于同步调度单的OrdICD_ID参数） */
    private List<Long> diseaseIds;

    /** 执行人员列表（包含角色类型） */
    private List<AssigneeInfo> assignees;

    /** 急救转运任务扩展信息 */
    private EmergencyInfoVO emergencyInfo;

    public Long getTaskId() {
        return taskId;
    }

    public void setTaskId(Long taskId) {
        this.taskId = taskId;
    }

    public String getTaskDescription() {
        return taskDescription;
    }

    public void setTaskDescription(String taskDescription) {
        this.taskDescription = taskDescription;
    }

    public String getDepartureAddress() {
        return departureAddress;
    }

    public void setDepartureAddress(String departureAddress) {
        this.departureAddress = departureAddress;
    }

    public String getDestinationAddress() {
        return destinationAddress;
    }

    public void setDestinationAddress(String destinationAddress) {
        this.destinationAddress = destinationAddress;
    }

    public Date getPlannedStartTime() {
        return plannedStartTime;
    }

    public void setPlannedStartTime(Date plannedStartTime) {
        this.plannedStartTime = plannedStartTime;
    }

    public Date getPlannedEndTime() {
        return plannedEndTime;
    }

    public void setPlannedEndTime(Date plannedEndTime) {
        this.plannedEndTime = plannedEndTime;
    }

    public Long getAssigneeId() {
        return assigneeId;
    }

    public void setAssigneeId(Long assigneeId) {
        this.assigneeId = assigneeId;
    }

    public String getRemark() {
        return remark;
    }

    public void setRemark(String remark) {
        this.remark = remark;
    }

    public BigDecimal getDepartureLongitude() {
        return departureLongitude;
    }

    public void setDepartureLongitude(BigDecimal departureLongitude) {
        this.departureLongitude = departureLongitude;
    }

    public BigDecimal getDepartureLatitude() {
        return departureLatitude;
    }

    public void setDepartureLatitude(BigDecimal departureLatitude) {
        this.departureLatitude = departureLatitude;
    }

    public BigDecimal getDestinationLongitude() {
        return destinationLongitude;
    }

    public void setDestinationLongitude(BigDecimal destinationLongitude) {
        this.destinationLongitude = destinationLongitude;
    }

    public BigDecimal getDestinationLatitude() {
        return destinationLatitude;
    }

    public void setDestinationLatitude(BigDecimal destinationLatitude) {
        this.destinationLatitude = destinationLatitude;
    }

    public String getTaskType() {
        return taskType;
    }

    public void setTaskType(String taskType) {
        this.taskType = taskType;
    }

    public Long getDeptId() {
        return deptId;
    }

    public void setDeptId(Long deptId) {
        this.deptId = deptId;
    }

    public List<Long> getVehicleIds() {
        return vehicleIds;
    }

    public void setVehicleIds(List<Long> vehicleIds) {
        this.vehicleIds = vehicleIds;
    }

    public List<Long> getDiseaseIds() {
        return diseaseIds;
    }

    public void setDiseaseIds(List<Long> diseaseIds) {
        this.diseaseIds = diseaseIds;
    }

    public EmergencyInfoVO getEmergencyInfo() {
        return emergencyInfo;
    }

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

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

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

    /**
     * 急救转运任务扩展信息内部类
     */
    public static class EmergencyInfoVO {
        /** 患者联系人 */
        private String patientContact;
        
        /** 患者联系电话 */
        private String patientPhone;
        
        /** 患者姓名 */
        private String patientName;
        
        /** 患者性别 */
        private String patientGender;
        
        /** 患者身份证号 */
        private String patientIdCard;
        
        /** 患者病情描述 */
        private String patientCondition;
        
        /** 转出医院ID */
        private Long hospitalOutId;
        
        /** 转出医院名称 */
        private String hospitalOutName;
        
        /** 转出医院科室 */
        private String hospitalOutDepartment;
        
        /** 转出医院科室ID */
        private String hospitalOutDepartmentId;
        
        /** 转出医院床号 */
        private String hospitalOutBedNumber;
        
        /** 转出医院地址 */
        private String hospitalOutAddress;
        
        /** 转出医院经度 */
        private BigDecimal hospitalOutLongitude;
        
        /** 转出医院纬度 */
        private BigDecimal hospitalOutLatitude;
        
        /** 转入医院ID */
        private Long hospitalInId;
        
        /** 转入医院名称 */
        private String hospitalInName;
        
        /** 转入医院科室 */
        private String hospitalInDepartment;
        
        /** 转入医院科室ID */
        private String hospitalInDepartmentId;
        
        /** 转入医院床号 */
        private String hospitalInBedNumber;
        
        /** 转入医院地址 */
        private String hospitalInAddress;
        
        /** 转入医院经度 */
        private BigDecimal hospitalInLongitude;
        
        /** 转入医院纬度 */
        private BigDecimal hospitalInLatitude;
        
        /** 转运公里数 */
        private BigDecimal transferDistance;
        
        /** 转运费用 */
        private BigDecimal transferPrice;

        // Getters and Setters
        public String getPatientContact() {
            return patientContact;
        }

        public void setPatientContact(String patientContact) {
            this.patientContact = patientContact;
        }

        public String getPatientPhone() {
            return patientPhone;
        }

        public void setPatientPhone(String patientPhone) {
            this.patientPhone = patientPhone;
        }

        public String getPatientName() {
            return patientName;
        }

        public void setPatientName(String patientName) {
            this.patientName = patientName;
        }

        public String getPatientGender() {
            return patientGender;
        }

        public void setPatientGender(String patientGender) {
            this.patientGender = patientGender;
        }

        public String getPatientIdCard() {
            return patientIdCard;
        }

        public void setPatientIdCard(String patientIdCard) {
            this.patientIdCard = patientIdCard;
        }

        public String getPatientCondition() {
            return patientCondition;
        }

        public void setPatientCondition(String patientCondition) {
            this.patientCondition = patientCondition;
        }

        public Long getHospitalOutId() {
            return hospitalOutId;
        }

        public void setHospitalOutId(Long hospitalOutId) {
            this.hospitalOutId = hospitalOutId;
        }

        public String getHospitalOutName() {
            return hospitalOutName;
        }

        public void setHospitalOutName(String hospitalOutName) {
            this.hospitalOutName = hospitalOutName;
        }

        public String getHospitalOutDepartment() {
            return hospitalOutDepartment;
        }

        public void setHospitalOutDepartment(String hospitalOutDepartment) {
            this.hospitalOutDepartment = hospitalOutDepartment;
        }

        public String getHospitalOutDepartmentId() {
            return hospitalOutDepartmentId;
        }

        public void setHospitalOutDepartmentId(String hospitalOutDepartmentId) {
            this.hospitalOutDepartmentId = hospitalOutDepartmentId;
        }

        public String getHospitalOutBedNumber() {
            return hospitalOutBedNumber;
        }

        public void setHospitalOutBedNumber(String hospitalOutBedNumber) {
            this.hospitalOutBedNumber = hospitalOutBedNumber;
        }

        public String getHospitalOutAddress() {
            return hospitalOutAddress;
        }

        public void setHospitalOutAddress(String hospitalOutAddress) {
            this.hospitalOutAddress = hospitalOutAddress;
        }

        public BigDecimal getHospitalOutLongitude() {
            return hospitalOutLongitude;
        }

        public void setHospitalOutLongitude(BigDecimal hospitalOutLongitude) {
            this.hospitalOutLongitude = hospitalOutLongitude;
        }

        public BigDecimal getHospitalOutLatitude() {
            return hospitalOutLatitude;
        }

        public void setHospitalOutLatitude(BigDecimal hospitalOutLatitude) {
            this.hospitalOutLatitude = hospitalOutLatitude;
        }

        public Long getHospitalInId() {
            return hospitalInId;
        }

        public void setHospitalInId(Long hospitalInId) {
            this.hospitalInId = hospitalInId;
        }

        public String getHospitalInName() {
            return hospitalInName;
        }

        public void setHospitalInName(String hospitalInName) {
            this.hospitalInName = hospitalInName;
        }

        public String getHospitalInDepartment() {
            return hospitalInDepartment;
        }

        public void setHospitalInDepartment(String hospitalInDepartment) {
            this.hospitalInDepartment = hospitalInDepartment;
        }

        public String getHospitalInDepartmentId() {
            return hospitalInDepartmentId;
        }

        public void setHospitalInDepartmentId(String hospitalInDepartmentId) {
            this.hospitalInDepartmentId = hospitalInDepartmentId;
        }

        public String getHospitalInBedNumber() {
            return hospitalInBedNumber;
        }

        public void setHospitalInBedNumber(String hospitalInBedNumber) {
            this.hospitalInBedNumber = hospitalInBedNumber;
        }

        public String getHospitalInAddress() {
            return hospitalInAddress;
        }

        public void setHospitalInAddress(String hospitalInAddress) {
            this.hospitalInAddress = hospitalInAddress;
        }

        public BigDecimal getHospitalInLongitude() {
            return hospitalInLongitude;
        }

        public void setHospitalInLongitude(BigDecimal hospitalInLongitude) {
            this.hospitalInLongitude = hospitalInLongitude;
        }

        public BigDecimal getHospitalInLatitude() {
            return hospitalInLatitude;
        }

        public void setHospitalInLatitude(BigDecimal hospitalInLatitude) {
            this.hospitalInLatitude = hospitalInLatitude;
        }

        public BigDecimal getTransferDistance() {
            return transferDistance;
        }

        public void setTransferDistance(BigDecimal transferDistance) {
            this.transferDistance = transferDistance;
        }

        public BigDecimal getTransferPrice() {
            return transferPrice;
        }

        public void setTransferPrice(BigDecimal transferPrice) {
            this.transferPrice = transferPrice;
        }
    }

    /**
     * 执行人员信息内部类
     */
    public static class AssigneeInfo {
        /** 用户ID */
        private Long userId;
        
        /** 用户姓名 */
        private String userName;
        
        /** 用户类型（角色）：driver-司机, doctor-医生, nurse-护士 */
        private String userType;

        public Long getUserId() {
            return userId;
        }

        public void setUserId(Long userId) {
            this.userId = userId;
        }

        public String getUserName() {
            return userName;
        }

        public void setUserName(String userName) {
            this.userName = userName;
        }

        public String getUserType() {
            return userType;
        }

        public void setUserType(String userType) {
            this.userType = userType;
        }
    }
    private Date updateTime;
}