feat: 修复统计

wlzboy

6 天以前 fe33646ee6e2d1e57f2b51812e94983a0e9efb04

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

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

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

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

@@ -123,11 +127,36 @@
    /** 操作日志列表 */
    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;
@@ -305,6 +334,14 @@
        return deptName;
    }

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

    public String getVehicleNo() {
        return vehicleNo;
    }

    public void setDelFlag(String delFlag) {
        this.delFlag = delFlag;
    }
@@ -361,6 +398,14 @@
        return welfareInfo;
    }

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

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

    /**
     * 判断是否可以变更状态
     */