From 3d4740d76f50222ce00587abea81b56afa35f6db Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 12 三月 2026 14:44:45 +0800
Subject: [PATCH] 【丽水】先通过任务ID、部门code,判断ServiceTaskdept是否存在，不存在则新增，存在则修改
---
smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
index a1a4275..2d714c2 100644
--- a/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
+++ b/smartor/src/main/java/com/smartor/domain/PatTaskRelevance.java
@@ -1,5 +1,6 @@
package com.smartor.domain;
+import com.alibaba.fastjson.JSONObject;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.annotation.Excel;
import com.ruoyi.common.core.domain.BaseEntity;
@@ -214,10 +215,10 @@
/**
* 鍙戦�佹椂闂�
*/
- @Excel(name = "灏辫瘖鏃堕棿")
+ @Excel(name = "鍙戦�佹椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ApiModelProperty("灏辫瘖鏃堕棿")
- private Date visitTime;
+ @ApiModelProperty("鍙戦�佹椂闂�")
+ private Date visittime;
/**
@@ -233,6 +234,13 @@
@Excel(name = "灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
@ApiModelProperty("灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�")
private String hospType;
+
+ /**
+ * 灏辫瘖绫诲瀷锛�1闂ㄨ瘖 2鍑洪櫌锛�
+ */
+ @Excel(name = "灏辫瘖id锛�1闂ㄨ瘖 2鍑洪櫌锛�")
+ @ApiModelProperty("灏辫瘖id锛�1闂ㄨ瘖 2鍑洪櫌锛�")
+ private Long hospid;
/**
@@ -312,4 +320,22 @@
@Excel(name = " 闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
@ApiModelProperty(value = "闀挎湡浠诲姟锛岀粰鎮ｈ�呭彂閫佺殑鏃堕棿")
private Date longSendTime;
+
+
+ @ApiModelProperty(value = "缁х画鏍囪瘑")
+ private Integer continueFlag;
+
+ @ApiModelProperty(value = "缁х画鏃堕棿鐜板湪")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date continueTimeNow;
+
+ @ApiModelProperty(value = "缁х画鍐呭")
+ private JSONObject continueContent;
+
+ @ApiModelProperty(value = "缁х画娆℃暟")
+ private Integer continueCount;
+
+ @ApiModelProperty(value = "缁х画鏃堕棿涓嬫")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date continueTimeNext;
}
--
Gitblit v1.9.3