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/LimsQingyandanReportEntity.java |  210 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 210 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsQingyandanReportEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsQingyandanReportEntity.java
new file mode 100644
index 0000000..7c10f8b
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsQingyandanReportEntity.java
@@ -0,0 +1,210 @@
+package jnpf.limsEntity;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonAlias;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 璇烽獙鍗曟姤鍛婂疄浣撶被銆�
+ * 鍦ㄦ墍鏈� lims_jianyan_xiang 閮借繘鍏� audited 鐘舵�佸悗锛�
+ * 鐢� LimsQingyandanReportService.tryGenerate 鑷姩浠� lims_qingyandan 澶嶅埗鐢熸垚銆�
+ */
+@Data
+@TableName("lims_qingyandan_report")
+public class LimsQingyandanReportEntity {
+
+    @TableId(value = "f_id")
+    @JsonProperty("f_id")
+    @JsonAlias("id")
+    private String id;
+
+    @TableField(value = "f_tenant_id", fill = FieldFill.INSERT_UPDATE)
+    private String tenantId;
+
+    /** 璇烽獙鍗� ID锛坙ims_qingyandan.f_id锛� */
+    @TableField("qingyandan_id")
+    private String qingyandanId;
+
+    /** 妫�楠屾祦姘村彿 */
+    @TableField("jianyan_liushuihao")
+    private String jianyanLiushuihao;
+
+    /** 鎶ュ憡涔︾紪鍙凤紝瑙勫垯 {chanpin_bianma}-{yyyyDDD}A{NN}锛実enerateReportData 鏃朵竴娆℃�х敓鎴� */
+    @TableField("baogao_bianhao")
+    private String baogaoBianhao;
+
+    /** 璇烽獙鏃ユ湡锛堟潵鑷� lims_qingyandan.f_creator_time 蹇収锛� */
+    @TableField("qingyan_riqi")
+    private Date qingyanRiqi;
+
+    /** 璇烽獙绫诲瀷 */
+    @TableField("biz_type")
+    private String bizType;
+
+    /** 浜у搧 id */
+    @TableField("chanpin_id")
+    private String chanpinId;
+
+    /** 浜у搧鍚嶇О */
+    @TableField("chanpin_mingcheng")
+    private String chanpinMingcheng;
+
+    /** 浜у搧缂栫爜 */
+    @TableField("chanpin_bianma")
+    private String chanpinBianma;
+
+    /** 鎵瑰彿 */
+    @TableField("pihao")
+    private String pihao;
+
+    /** 瑙勬牸 */
+    @TableField("guige")
+    private String guige;
+
+    /** 鎵归噺 */
+    @TableField("piliang")
+    private String piliang;
+
+    /** 鎵归噺鍗曚綅 */
+    @TableField("piliang_danwei")
+    private String piliangDanwei;
+
+    /** 鐢熶骇鏃ユ湡 */
+    @TableField("shengchan_riqi")
+    private Date shengchanRiqi;
+
+    /** 鏈夋晥鏈熻嚦锛堝瓧绗︿覆锛屽父瑙佹牸寮� YYYY-MM 鎴� YYYY-MM-DD锛涘師杈呭寘鍏佽骞�-鏈堬級 */
+    @TableField("youxiaoqi")
+    private String youxiaoqi;
+
+    /** 鍙栨牱鍦扮偣 */
+    @TableField("quyang_didian")
+    private String quyangDidian;
+
+    /** 鍙栨牱浜� */
+    @TableField("quyangren")
+    private String quyangren;
+
+    /** 鍙栨牱鏃ユ湡 */
+    @TableField("quyang_riqi")
+    private Date quyangRiqi;
+
+    /** 鍙栨牱閲� */
+    @TableField("quyangliang")
+    private String quyangliang;
+
+    /** 鍙栨牱鍗曚綅 */
+    @TableField("quyang_danwei")
+    private String quyangDanwei;
+
+    /** 鍌ㄥ瓨鏉′欢 */
+    @TableField("chucun_tiaojian")
+    private String chucunTiaojian;
+
+    /** 妫�娴嬫柟寮� */
+    @TableField("jiance_fangshi")
+    private String jianceFangshi;
+
+    /** 妫�娴嬮」鐩紙涓庢簮琛ㄤ竴鑷达紝瀛� JSON 鏁扮粍瀛楃涓诧級 */
+    @TableField("jiance_xiangmu")
+    private String jianceXiangmu;
+
+    /** 璇烽獙澶囨敞 */
+    @TableField("beizhu")
+    private String beizhu;
+
+    /** 鎶ュ憡鐘舵�侊紙BaogaoStatus锛� */
+    @TableField("baogao_zhuangtai")
+    private String baogaoZhuangtai;
+
+    /** 閫�鍥炲師鍥狅紙鍙缃┖锛� */
+    @TableField(value = "tuihui_yuanyin", updateStrategy = FieldStrategy.ALWAYS)
+    private String tuihuiYuanyin;
+
+    /** 閫�鍥炰汉锛堝彲琚疆绌猴級 */
+    @TableField(value = "tuihui_ren", updateStrategy = FieldStrategy.ALWAYS)
+    private String tuihuiRen;
+
+    /** 閫�鍥炰汉绛惧悕锛堝彲琚疆绌猴級 */
+    @TableField(value = "tuihui_ren_sign", updateStrategy = FieldStrategy.ALWAYS)
+    private String tuihuiRenSign;
+
+    /** 鏄惁鍚堟牸锛堝墠绔瓧鍏哥爜锛� */
+    @TableField("shifou_hege")
+    private String shifouHege;
+
+    /** 鎶ュ憡浜猴紙鎻愪氦鎶ュ憡鏃跺啓鍏ワ級 */
+    @TableField("baogao_ren")
+    private String baogaoRen;
+
+    /** 鎶ュ憡鏃ユ湡锛堟彁浜ゆ姤鍛婃椂鍐欏叆锛� */
+    @TableField("baogao_riqi")
+    private Date baogaoRiqi;
+
+    /** 瀹℃牳浜猴紙瀹℃牳鎶ュ憡鏃跺啓鍏ワ級 */
+    @TableField("shenhe_ren")
+    private String shenheRen;
+
+    /** 瀹℃牳鏃ユ湡锛堝鏍告姤鍛婃椂鍐欏叆锛� */
+    @TableField("shenhe_riqi")
+    private Date shenheRiqi;
+
+    /** 鎵瑰噯浜猴紙鎵瑰噯鎶ュ憡鏃跺啓鍏ワ級 */
+    @TableField("pizhun_ren")
+    private String pizhunRen;
+
+    /** 鎵瑰噯鏃ユ湡锛堟壒鍑嗘姤鍛婃椂鍐欏叆锛� */
+    @TableField("pizhun_riqi")
+    private Date pizhunRiqi;
+
+    /** 娴佺▼ id */
+    @TableField("f_flow_id")
+    private String flowId;
+
+    /** 涔愯閿� */
+    @TableField("f_version")
+    private Integer version;
+
+    /** 娴佺▼浠诲姟涓婚敭 */
+    @TableField("f_flow_task_id")
+    private String flowTaskId;
+
+    /** 娴佺▼浠诲姟鐘舵�� */
+    @TableField("f_flow_state")
+    private Integer flowState;
+
+    /** 鍒犻櫎鏍囧織 */
+    @TableField("f_delete_mark")
+    private Integer deleteMark;
+
+    /** 鍒犻櫎鏃堕棿 */
+    @TableField("f_delete_time")
+    private Date deleteTime;
+
+    /** 鍒犻櫎鐢ㄦ埛 */
+    @TableField("f_delete_user_id")
+    private String deleteUserId;
+
+    /** 鍒涘缓鐢ㄦ埛 */
+    @TableField(value = "f_creator_user_id", fill = FieldFill.INSERT)
+    private String creatorUserId;
+
+    /** 鍒涘缓鏃堕棿 */
+    @TableField(value = "f_creator_time", fill = FieldFill.INSERT)
+    private Date creatorTime;
+
+    /** 淇敼鐢ㄦ埛 */
+    @TableField(value = "f_last_modify_user_id", fill = FieldFill.UPDATE)
+    private String lastModifyUserId;
+
+    /** 淇敼鏃堕棿 */
+    @TableField(value = "f_last_modify_time", fill = FieldFill.UPDATE)
+    private Date lastModifyTime;
+}

--
Gitblit v1.8.0