From c24d16a37523a49080392610357872ce580cbc38 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 26 十月 2026 14:03:33 +0800
Subject: [PATCH] 代码提交
---
ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/domain/row/SatisfactionSubtaskQuery.java | 44 +++++++++++++++++++++++++++++++++++++++-----
1 files changed, 39 insertions(+), 5 deletions(-)
diff --git a/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/domain/row/SatisfactionSubtaskQuery.java b/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/domain/row/SatisfactionSubtaskQuery.java
index f2ca5ae..0ae8446 100644
--- a/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/domain/row/SatisfactionSubtaskQuery.java
+++ b/ruoyi-satisfaction/src/main/java/com/ruoyi/satisfaction/domain/row/SatisfactionSubtaskQuery.java
@@ -51,20 +51,54 @@
private Date endOutHospTime;
/**
- * 缁村害鏍囪瘑锛歿@code 1} 琛ㄧず鎸夌梾鍖鸿繃婊�
+ * 瀹屾垚寮�濮嬫椂闂达紙鎸� finishtime 杩囨护锛屽搴旈〉闈㈡彁浜ょ殑 {@code startFinishTime}锛�
* <p>
- * 鈿狅笍 鍘� SQL 鐢ㄧ殑鏄� {@code <if test="deptOrDistrict==1">}锛堜笌鏁板瓧姣旇緝锛夛紝
- * 鍥犳杩欓噷鏄� {@code Integer}锛屽彇鍊艰涔変笌鍘熸潵涓�鑷淬��
+ * 鈿狅笍 2026-10-21 鏂板锛氬師鏉ュ彧鏈� outHospTime 涓や釜瀛楁锛岃�岄〉闈㈡彁浜ょ殑鏄�
+ * {@code startFinishTime / endFinishTime}锛孋ontroller 涔熸病鏈夋妸瀹冧滑浼犱笅鏉ワ紝
+ * 浜庢槸鍙栧瓙浠诲姟鏃�<b>瀹屽叏娌℃湁鏃堕棿鏉′欢</b> 鈥斺�� 鏃㈠鑷寸粺璁″彛寰勪笉瀵癸紝涔熷鑷�
+ * {@code service_subtask} 琚叏閲忔壂鎻忋�佷笅娓告槑缁嗙粺璁℃嬁鍒板嚑涓囦釜 id銆�
+ */
+ private Date startFinishTime;
+
+ /**
+ * 瀹屾垚缁撴潫鏃堕棿锛堟寜 finishtime 杩囨护锛�
+ */
+ private Date endFinishTime;
+
+ /**
+ * 缁村害缁勫悎鏂瑰紡锛氱梾鍖虹淮搴︿笌绉戝缁村害涔嬮棿鍙� AND 杩樻槸 OR銆�
+ * <ul>
+ * <li>{@code 1}锛氱梾鍖� AND 绉戝锛堥〉闈㈤粯璁ゅ�硷級</li>
+ * <li>{@code 2}锛氱梾鍖� OR 绉戝</li>
+ * <li>鍏跺畠鍙栧�硷細娌跨敤鏃ц涓猴紙鍙湅绉戝锛�</li>
+ * </ul>
+ * 瀛楁绫诲瀷鏄� {@code String}锛堝叆鍙傛槸 JSON 瀛楃涓诧級锛孲QL 閲岀敤 {@code q.deptOrDistrict==1}
+ * 涓庢暟瀛楁瘮杈� 鈥斺�� OGNL 浼氭妸 {@code "1"} 杞垚鏁板瓧鍐嶆瘮锛岀粨璁轰笌瀛楃涓叉瘮杈冧竴鑷达紝
+ * 杩欓噷淇濈暀鍘熷啓娉曚笉鍔紝閬垮厤鏀瑰彛寰勩��
*/
private String deptOrDistrict = "1";
/**
- * 鐥呭尯浠ｇ爜鍒楄〃锛堜粎鍦� {@code deptOrDistrict == 1} 鏃剁敓鏁堬級
+ * 鍦ㄩ櫌/褰撳墠鐥呭尯浠ｇ爜鍒楄〃 鈫� 钀藉埌 {@code service_subtask.hospitaldistrictcode}
+ * <p>
+ * 涓� {@link #leavehospitaldistrictcodes} 鏄�屽悓涓�缁村害鐨勪袱鍒椼�嶏細鍝釜鍙傛暟浼犺繘鏉ュ氨杩囨护鍝竴鍒楋紝
+ * 涓嶅啀涓�寰嬫寜绂婚櫌鐥呭尯杩囨护锛堝崡鍗庤繖鎵规暟鎹梾鍖哄啓鍦� hospitaldistrictcode锛�
+ * leavehospitaldistrictcode 鍩烘湰涓虹┖锛屽彧璁ゅ悗鑰呬細璁╃粺璁″彧鍓╁嚑鏉★級銆�
+ */
+ private List<String> hospitaldistrictcodes;
+
+ /**
+ * 绂婚櫌鐥呭尯浠ｇ爜鍒楄〃 鈫� 钀藉埌 {@code service_subtask.leavehospitaldistrictcode}
*/
private List<String> leavehospitaldistrictcodes;
/**
- * 绉戝浠ｇ爜鍒楄〃
+ * 鍦ㄩ櫌/褰撳墠绉戝浠ｇ爜鍒楄〃 鈫� 钀藉埌 {@code service_subtask.deptcode}
+ */
+ private List<String> deptcodes;
+
+ /**
+ * 绂婚櫌绉戝浠ｇ爜鍒楄〃 鈫� 钀藉埌 {@code service_subtask.leaveldeptcode}
*/
private List<String> leaveldeptcodes;
}
--
Gitblit v1.9.3