From 3bbd80a63ac7728ac01b641a48a26befcb171a0f Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 15 十二月 2025 07:19:21 +0800
Subject: [PATCH] feat:增加企业微信登录判断
---
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysTask.java | 63 +++++++++++++++++++++++++++++++
1 files changed, 63 insertions(+), 0 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 0cb20ea..b950aaa 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
@@ -108,8 +108,15 @@
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptName;
+ /** 杞︾墝鍙�(鍒楄〃鏄剧ず绗竴杈嗚溅) */
+ @Excel(name = "杞︾墝鍙�")
+ private String vehicleNo;
+
/** 鍒犻櫎鏍囧織锛�0浠h〃瀛樺湪 2浠h〃鍒犻櫎锛� */
private String delFlag;
+
+ /** 鏃х郴缁熷悓姝ユ爣璁帮細0-鏈悓姝ワ紝1-宸插悓姝� */
+ private Integer legacySynced;
/** 鍏宠仈杞﹁締鍒楄〃 */
private List<SysTaskVehicle> assignedVehicles;
@@ -120,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;
@@ -302,12 +334,28 @@
return deptName;
}
+ public void setVehicleNo(String vehicleNo) {
+ this.vehicleNo = vehicleNo;
+ }
+
+ public String getVehicleNo() {
+ return vehicleNo;
+ }
+
public void setDelFlag(String delFlag) {
this.delFlag = delFlag;
}
public String getDelFlag() {
return delFlag;
+ }
+
+ public void setLegacySynced(Integer legacySynced) {
+ this.legacySynced = legacySynced;
+ }
+
+ public Integer getLegacySynced() {
+ return legacySynced;
}
public void setAssignedVehicles(List<SysTaskVehicle> assignedVehicles) {
@@ -350,6 +398,14 @@
return welfareInfo;
}
+ public void setAssignees(List<SysTaskAssignee> assignees) {
+ this.assignees = assignees;
+ }
+
+ public List<SysTaskAssignee> getAssignees() {
+ return assignees;
+ }
+
/**
* 鍒ゆ柇鏄惁鍙互鍙樻洿鐘舵��
*/
@@ -385,6 +441,13 @@
}
}
+ public void setPlanedStartTime(Date plannedStartTime) {
+ this.plannedStartTime = plannedStartTime;
+ }
+ public Date getPlanedStartTime() {
+ return plannedStartTime;
+ }
+
/**
* 鍒ゆ柇鏄惁瓒呮椂
*/
--
Gitblit v1.9.1