From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanAssignItem.java |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanAssignItem.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanAssignItem.java
new file mode 100644
index 0000000..74bfcb0
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanAssignItem.java
@@ -0,0 +1,52 @@
+package jnpf.limsEntity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 妫�楠屼换鍔�"閫愯鍒嗛厤"鍗曡鍏ュ弬銆�
+ *
+ * <p>鍒嗛厤鎸夎鐨� {@code shifou_waijian} 璧颁袱绉嶅垎鏀細
+ * <ul>
+ *   <li>鏅�氭楠岋紙{@code shifou_waijian} != "yes"锛夛細闇�瑕� {@code jianchaRen} +
+ *       {@code wanchengRiqi}锛屽嵆鍒嗛厤缁欐煇涓楠屽憳銆�</li>
+ *   <li>澶栨锛坽@code shifou_waijian} = "yes"锛夛細鍒嗛厤缁欏閮ㄦ楠屽崟浣嶏紝闇�瑕�
+ *       {@code waijianDanwei} + {@code waijianLururen}锛泏@code jianchaRen} /
+ *       {@code wanchengRiqi} 涓嶅己鍒惰姹傘��</li>
+ * </ul>
+ * 鏈嶅姟绔牴鎹褰撳墠鐨� {@code shifou_waijian} 鑷姩閫夋嫨鍒嗘敮骞惰惤搴擄紝鍓嶇鎸夎〃鍗�
+ * 绫诲瀷鍙紶闇�瑕佺殑瀛楁鍗冲彲銆�
+ *
+ * <p>澶栧眰鐢� {@link LimsJianyanAssignParam} 鎵胯浇鍏变韩鐨� bizSign銆�
+ */
+@Data
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
+public class LimsJianyanAssignItem {
+
+    /** lims_jianyan_xiang 涓婚敭 */
+    private String id;
+
+    /** 妫�楠屽憳 userId锛屽啓鍏� jiancha_ren锛堟櫘閫氭楠岄」蹇呭~锛� */
+    private String jianchaRen;
+
+    /** 瑕佹眰瀹屾垚鏃ユ湡锛屽啓鍏� wancheng_riqi銆傚墠绔紶瀛楃涓� "yyyy-MM-dd"锛堟櫘閫氭楠岄」蹇呭~锛� */
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date wanchengRiqi;
+
+    /** 澶栨妫�娴嬪崟浣嶏紝鍐欏叆 waijian_danwei锛坰hifou_waijian=yes 鏃跺繀濉級 */
+    private String waijianDanwei;
+
+    /** 澶栨缁撴灉褰曞叆浜猴紝鍐欏叆 waijian_lururen锛坰hifou_waijian=yes 鏃跺繀濉級 */
+    private String waijianLururen;
+
+    /** 鍚堝悓鍙� */
+    private String hetonghao;
+
+    /** 澶囨敞 */
+    private String beizhu;
+
+}

--
Gitblit v1.8.0