From 3e5134249dc75acdabfc467d8c03f321992cdf07 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 23 十月 2025 18:11:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TMission.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 48 insertions(+), 2 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 fa682b1..84a5c55 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
@@ -52,6 +52,10 @@
@TableField("mission_content")
private String missionContent;
+ @ApiModelProperty(value = "敌情数量")
+ @TableField("enemy_content")
+ private String enemyContent;
+
@ApiModelProperty(value = "任务音频")
@TableField("mission_audio")
private String missionAudio;
@@ -64,7 +68,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;
@@ -108,13 +112,55 @@
@TableField("attempt_score")
private Double attemptScore;
+ @ApiModelProperty(value = "指派时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("assign_time")
+ private LocalDateTime assignTime;
+
+ @ApiModelProperty(value = "接收时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @TableField("receive_time")
+ private LocalDateTime receiveTime;
+
@ApiModelProperty(value = "完成时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("finish_time")
private LocalDateTime finishTime;
-
+ @ApiModelProperty(value = "是否在任务池 1=是 0=否")
+ @TableField("is_mission_pool")
private Integer isMissionPool;
+ @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