From 816eea15ab68b3efb03786be616687b2e197014f Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期四, 15 十月 2026 17:35:47 +0800
Subject: [PATCH] 【丽水】insertOrUpdateTask报错问题处理

---
 smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java |   23 +++++++++++++++++++++++
 1 files changed, 23 insertions(+), 0 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java b/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
index 6946849..6dfd9ef 100644
--- a/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
+++ b/smartor/src/main/java/com/smartor/domain/VO/ServiceSubtaskVO.java
@@ -8,6 +8,7 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
 import java.util.List;
@@ -216,6 +217,7 @@
      * 鍙戦�佹棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "鍙戦�佹棩鏈�")
     private Date senddate;
@@ -288,6 +290,7 @@
      * 瀹屾垚鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 瀹屾垚鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "瀹屾垚鏃堕棿")
     private Date finishtime;
@@ -296,6 +299,7 @@
      * 瀹屾垚鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "瀹屾垚鏃堕棿(寮�濮嬫煡璇�)")
     private Date finishtimeStart;
 
@@ -303,6 +307,7 @@
      * 瀹屾垚鏃堕棿(缁撴潫鏌ヨ)
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "瀹屾垚鏃堕棿(缁撴潫鏌ヨ)")
     private Date finishtimeEnd;
 
@@ -326,6 +331,7 @@
      * 鎷夊彇鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 鎷夊彇鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "鎷夊彇鏃堕棿")
     private Date pulltime;
@@ -409,6 +415,7 @@
      * 涓婁紶鏃堕棿
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @Excel(name = " 涓婁紶鏃堕棿 ", width = 30, dateFormat = "yyyy-MM-dd")
     @ApiModelProperty(value = "涓婁紶鏃堕棿")
     private Date uploadTime;
@@ -683,6 +690,7 @@
      * 寮�濮嬪嚭闄㈡棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "寮�濮嬪嚭闄㈡棩鏈�")
     private Date startOutHospTime;
 
@@ -690,6 +698,7 @@
      * 寮�濮嬪彂閫佹棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "寮�濮嬪彂閫佹棩鏈�")
     private Date startSendDateTime;
 
@@ -697,6 +706,7 @@
      * 缁撴潫鍙戦�佹棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "缁撴潫鍙戦�佹棩鏈�")
     private Date endSendDateTime;
 
@@ -704,6 +714,7 @@
      * 缁撴潫鍑洪櫌鏃ユ湡
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
     private Date endOutHospTime;
 
@@ -795,6 +806,18 @@
     @ApiModelProperty(value = "椤甸潰灞曠ず鐘舵�� 锛�1锛氬緟闅忚锛�2 寰呭彂閫侊級锛�2锛氶殢璁夸腑锛�3 宸插彂閫併��1 琚鍙栵級銆�3锛氭湭瀹屾垚锛�5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級銆�4锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�5锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級")
     private Long sendstateView;
 
+    /**
+     * 鏄惁鍗冲皢瓒呮椂锛�1 鏄紙閰嶅悎 soonTimeoutHours 浣跨敤锛岀敤浜庢煡璇㈠嵆灏嗚秴鏃跺垪琛級
+     */
+    @ApiModelProperty(value = "鏄惁鍗冲皢瓒呮椂:1鏄�")
+    private Integer soonTimeout;
+
+    /**
+     * 鍗冲皢瓒呮椂鏃堕棿锛堝皬鏃讹級锛氭埅姝㈡椂闂村湪 N 灏忔椂鍐�
+     */
+    @ApiModelProperty(value = "鍗冲皢瓒呮椂鏃堕棿(灏忔椂)")
+    private Integer soonTimeoutHours;
+
 //    /**
 //     * 鏃ユ湡闄愬埗 鐩墠鐢卞墠绔帶鍒�
 //     */

--
Gitblit v1.9.3