From 3daeab5130607a155190f05c06bddfbea1e8c1ee Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 11 九月 2026 12:16:28 +0800
Subject: [PATCH] 漏提交

---
 smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java |   39 ++++++++++++++++++++++++++++++++++++++-
 1 files changed, 38 insertions(+), 1 deletions(-)

diff --git a/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java b/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
index 2a85c3d..90ca575 100644
--- a/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
+++ b/smartor/src/main/java/com/smartor/domain/entity/ServiceSubtaskEntity.java
@@ -7,6 +7,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;
@@ -29,6 +30,12 @@
      */
     @ApiModelProperty(value = "涓婚敭id")
     private Long subId;
+
+    /**
+     * 涓婚敭id闆嗗悎
+     */
+    @ApiModelProperty(value = "涓婚敭id闆嗗悎")
+    private List<Long> subIdList;
 
 
     /**
@@ -105,6 +112,7 @@
      */
     @ApiModelProperty(value = "鍑犲ぉ鍙婃椂鐜�")
     private Integer rateDay;
+
     /**
      * 鎬у埆
      */
@@ -299,6 +307,19 @@
     @ApiModelProperty(value = "瀹屾垚鏃堕棿")
     private Date finishtime;
 
+    /**
+     * 瀹屾垚鏃堕棿
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "瀹屾垚鏃堕棿(寮�濮嬫煡璇�)")
+    private Date finishtimeStart;
+
+    /**
+     * 瀹屾垚鏃堕棿(缁撴潫鏌ヨ)
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @ApiModelProperty(value = "瀹屾垚鏃堕棿(缁撴潫鏌ヨ)")
+    private Date finishtimeEnd;
 
     /**
      * 灏辫瘖璁板綍缂栧彿
@@ -561,7 +582,7 @@
      */
     @Excel(name = "鎬诲垎")
     @ApiModelProperty(value = "鎬诲垎")
-    private Long score;
+    private String score;
 
 
     /**
@@ -676,6 +697,7 @@
      * 寮�濮嬪嚭闄㈡棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "寮�濮嬪嚭闄㈡棩鏈�")
     private Date startOutHospTime;
 
@@ -683,6 +705,7 @@
      * 寮�濮嬪彂閫佹棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "寮�濮嬪彂閫佹棩鏈�")
     private Date startSendDateTime;
 
@@ -690,6 +713,7 @@
      * 缁撴潫鍙戦�佹棩鏈�
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "缁撴潫鍙戦�佹棩鏈�")
     private Date endSendDateTime;
 
@@ -697,6 +721,7 @@
      * 缁撴潫鍑洪櫌鏃ユ湡
      */
     @JsonFormat(pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
     @ApiModelProperty(value = "缁撴潫鍑洪櫌鏃ユ湡")
     private Date endOutHospTime;
 
@@ -781,4 +806,16 @@
     @ApiModelProperty(value = "鍒嗙粍code闆嗗悎")
     private List<String> groupKeyList;
 
+    /**
+     * 鏈嶅姟鐘舵��
+     */
+//    @Excel(name = " 鍙戦�佺姸鎬� 1 琚鍙�(鍦ㄤ换鍔′腑鏄柊寤猴紝鍦ㄦ湇鍔′腑鏄棰嗗彇)  2 寰呭彂閫�  3 宸插彂閫�  4 涓嶆墽琛�  5 鍙戦�佸け璐� 6 宸插畬鎴怽") ")
+    @ApiModelProperty(value = "椤甸潰灞曠ず鐘舵�� 锛�1锛氬緟闅忚锛�1 琚鍙栥��2 寰呭彂閫併��3 宸插彂閫併��5 鍙戦�佸け璐ャ��7銆佽秴鏃讹級锛�2锛氬凡瀹屾垚锛� 6 宸插畬鎴愶級銆�3锛氭棤闇�闅忚锛�4 涓嶆墽琛岋級")
+    private Long sendstateView;
+
+    @ApiModelProperty(value = "鎵嬫湳璁板綍id 瀵瑰簲pat_med_operation_item.id")
+    private Long operationItemId;
+
+    @ApiModelProperty(value = "鎵嬫湳璁板綍id闆嗗悎")
+    private List<Long> operationItemIds;
 }

--
Gitblit v1.9.3