From 6676a35122fd9c97d1b1679c211bc8a9b97f08f2 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 24 三月 2026 23:17:37 +0800
Subject: [PATCH] feat: 增加日志记录历史消息
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java | 87 ++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 85 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java
index 2e5d1a8..a231557 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java
@@ -32,6 +32,7 @@
@Excel(name = "浠诲姟鐘舵��", readConverterExp = "PENDING=寰呭紑濮�,IN_PROGRESS=浠诲姟涓�,COMPLETED=宸插畬鎴�,CANCELLED=宸插彇娑�")
private String taskStatus;
+
/** 浠诲姟鎻忚堪 */
@Excel(name = "浠诲姟鎻忚堪")
private String taskDescription;
@@ -88,6 +89,8 @@
@Excel(name = "鍒涘缓浜篒D")
private Long creatorId;
+
+
/** 鎵ц浜篒D */
@Excel(name = "鎵ц浜篒D")
private Long assigneeId;
@@ -108,6 +111,10 @@
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptName;
+ /** 杞︾墝鍙�(鍒楄〃鏄剧ず绗竴杈嗚溅) */
+ @Excel(name = "杞︾墝鍙�")
+ private String vehicleNo;
+
/** 鍒犻櫎鏍囧織锛�0浠ｈ〃瀛樺湪 2浠ｈ〃鍒犻櫎锛� */
private String delFlag;
@@ -123,11 +130,57 @@
/** 鎿嶄綔鏃ュ織鍒楄〃 */
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;
+ }
+
+ // 鐢ㄤ簬SQL鏄犲皠鐨勫瓧娈碉紙澶氱爜鏌ヨ浼樺寲锛�
+ //杩欎簺瀛楁鎺ユ敹SQL鏌ヨ涓绠楀嚭鐨刣ispatchCode鍜宻erviceCode鍊�
+ private String dispatchCode;
+ private String serviceCode;
+
+ public String getDispatchCode() {
+ return dispatchCode;
+ }
+
+ public void setDispatchCode(String dispatchCode) {
+ this.dispatchCode = dispatchCode;
+ }
+
+ public String getServiceCode() {
+ return serviceCode;
+ }
+
+ public void setServiceCode(String serviceCode) {
+ this.serviceCode = serviceCode;
+ }
+ /**
+ * 鑾峰彇鏄剧ず浠诲姟缂栧彿锛屼紭鍏堣繑鍥炴�ユ晳杞繍鐨勮皟搴﹀崟缂栧彿锛屽叾娆℃槸鏈嶅姟鍗曠紪鍙凤紝鏈�鍚庢槸浠诲姟缂栧彿
+ */
+ 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 +358,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 +422,14 @@
return welfareInfo;
}
+ public void setAssignees(List<SysTaskAssignee> assignees) {
+ this.assignees = assignees;
+ }
+
+ public List<SysTaskAssignee> getAssignees() {
+ return assignees;
+ }
+
/**
* 鍒ゆ柇鏄惁鍙互鍙樻洿鐘舵��
*/
@@ -372,6 +441,9 @@
// 鐘舵�佹祦杞鍒�
switch (currentStatus) {
+ case NOT_CONFIRMED:
+ case NOT_DEPARTED:
+ case PARTIALLY_CONFIRMED:
case PENDING:
// 寰呭鐞� -> 鍑哄彂涓�佸凡鍙栨秷
return newStatus == TaskStatus.DEPARTING || newStatus == TaskStatus.CANCELLED;
@@ -385,8 +457,12 @@
// 杩旂▼涓� -> 宸插畬鎴�
return newStatus == TaskStatus.COMPLETED;
case IN_PROGRESS:
- // 鍏煎鏃ф暟鎹細浠诲姟涓� -> 宸插畬鎴愩�佸凡鍙栨秷銆佸緟澶勭悊
- return newStatus == TaskStatus.COMPLETED || newStatus == TaskStatus.CANCELLED || newStatus == TaskStatus.PENDING;
+ // 鍏煎鏃ф暟鎹細浠诲姟涓� -> 宸插畬鎴愩�佸凡鍙栨秷銆佸緟澶勭悊銆佸凡鍒拌揪銆佽繑绋嬩腑
+ return newStatus == TaskStatus.COMPLETED
+ || newStatus == TaskStatus.CANCELLED
+ || newStatus == TaskStatus.PENDING
+ || newStatus == TaskStatus.ARRIVED
+ || newStatus == TaskStatus.RETURNING;
case COMPLETED:
case CANCELLED:
// 宸插畬鎴愩�佸凡鍙栨秷 -> 涓嶅厑璁镐换浣曠姸鎬佸彉鏇�
@@ -396,6 +472,13 @@
}
}
+ public void setPlanedStartTime(Date plannedStartTime) {
+ this.plannedStartTime = plannedStartTime;
+ }
+ public Date getPlanedStartTime() {
+ return plannedStartTime;
+ }
+
/**
* 鍒ゆ柇鏄惁瓒呮椂
*/
--
Gitblit v1.9.1