From 26f6f43785afd992496d7fc79775124e557ff16d Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 21 十月 2025 17:56:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java | 72 +++++++++++++++++++++++++----------
1 files changed, 51 insertions(+), 21 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java
index ae084f4..0a97581 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java
@@ -1,15 +1,16 @@
package com.ruoyi.system.model;
+import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import java.io.Serializable;
import java.time.LocalDateTime;
/**
@@ -24,11 +25,11 @@
@EqualsAndHashCode(callSuper = false)
@TableName("t_mission")
@ApiModel(value="TMission对象", description="任务管理")
-public class TMission implements Serializable {
+public class TMission extends BaseModel {
private static final long serialVersionUID = 1L;
- @TableId("id")
+ @TableId(value = "id", type = IdType.ASSIGN_ID)
private String id;
@ApiModelProperty(value = "紧急程度 1=一般 2=加急 3=特急")
@@ -63,7 +64,7 @@
@TableField("mission_electronic")
private String missionElectronic;
- @ApiModelProperty(value = "状态 1=待指派 2=待完成 3=待评分 4=已完成 5=待改派")
+ @ApiModelProperty(value = "状态 1=待指派 2=待完成 3=待评分 4=已完成 5=待改派 6=未完成")
@TableField("status")
private Integer status;
@@ -107,26 +108,55 @@
@TableField("attempt_score")
private Double attemptScore;
- @ApiModelProperty(value = "创建时间")
- @TableField("create_time")
- private LocalDateTime createTime;
+ @ApiModelProperty(value = "指派时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("assign_time")
+ private LocalDateTime assignTime;
- @ApiModelProperty(value = "修改时间")
- @TableField("update_time")
- private LocalDateTime updateTime;
+ @ApiModelProperty(value = "接收时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("receive_time")
+ private LocalDateTime receiveTime;
- @ApiModelProperty(value = "创建人")
- @TableField("create_by")
- private String createBy;
+ @ApiModelProperty(value = "完成时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("finish_time")
+ private LocalDateTime finishTime;
- @ApiModelProperty(value = "修改人")
- @TableField("update_by")
- private String updateBy;
+ @ApiModelProperty(value = "是否在任务池 1=是 0=否")
+ @TableField("is_mission_pool")
+ private Integer isMissionPool;
- @ApiModelProperty(value = "是否删除 0=否 1=是")
- @TableField("disabled")
- @TableLogic
- private Integer disabled;
+ @ApiModelProperty(value = "响应时长")
+ @TableField("res_time")
+ private Double resTime;
+ @ApiModelProperty(value = "完成时长")
+ @TableField("success_time")
+ private Double successTime;
+
+
+ @ApiModelProperty(value = "用户任务id")
+ @TableField(exist = false)
+ private String userMissionId;
+
+
+
+ @ApiModelProperty(value = "任务类型")
+ @TableField(exist = false)
+ private String missionType;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "任务结果 1已完成 2未完成")
+ private Integer missionStatus;
+
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "任务评分 ")
+ private Double score;
+
+ @TableField(exist = false)
+ private TMissionUser missionUser;
}
--
Gitblit v1.7.1