From 94462d19bb33abe9654781d791ae0163a3e0e37e Mon Sep 17 00:00:00 2001
From: 陈昶聿 <chychen@nbjetron.com>
Date: 星期二, 27 一月 2026 16:29:07 +0800
Subject: [PATCH] 【丽水】微信已发送、已领取视为发送成功,不再进行补偿 改为 当前发送方式为微信的,且下一发送方式为短信的,微信发送状态为已发送、已领取的,跳过短信步骤

---
 smartor/src/main/java/com/smartor/domain/ServiceSubtask.java |   21 ++++++++++++++-------
 1 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
index e0ac5c6..1032473 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceSubtask.java
@@ -192,6 +192,14 @@
     private Date senddate;
 
     /**
+     * 鏂扮殑鍒涘缓鏃堕棿锛堢敤鏉ュ仛鏌ヨ鍙傛暟鐢級
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = " 鍙戦�佹棩鏈� ", width = 30, dateFormat = "yyyy-MM-dd")
+    @ApiModelProperty(value = "鏂扮殑鍒涘缓鏃堕棿")
+    private Date createTimeNew;
+
+    /**
      * 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒�
      */
     @Excel(name = " 涓婂崍寮�濮嬪彂閫佹椂闂撮檺鍒� ")
@@ -633,16 +641,15 @@
     @ApiModelProperty(value = "ps")
     private Integer ps;
 
-
-    /**
-     * 鎮h�呮潵婧�
-     */
     @ApiModelProperty(value = "缁忕鍖荤敓缂栫爜")
     private String managementDoctorCode;
 
-    /**
-     * 鎮h�呮潵婧�
-     */
     @ApiModelProperty(value = "缁忕鍖荤敓")
     private String managementDoctor;
+
+    @ApiModelProperty(value = "闅忚鎯呭喌:1姝e父璇煶,2鎮h�呮嫆鎺ユ垨鎷掕,3闈㈣鎴栬�呮帴璇�,4寰俊闅忚,5闅忚鐢佃瘽涓嶆纭�,6琚繃婊�,7鍏跺畠")
+    private Integer taskSituation;
+
+    @ApiModelProperty(value = "寮傚父棰勮锛�0缁胯壊锛�1绾㈣壊锛�2榛勮壊; 3宸插鐞�")
+    private Integer isabnormal;
 }

--
Gitblit v1.9.3