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

diff --git a/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanXiangEntity.java b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanXiangEntity.java
new file mode 100644
index 0000000..2b63b79
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-entity/src/main/java/jnpf/limsEntity/LimsJianyanXiangEntity.java
@@ -0,0 +1,275 @@
+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.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 鏍峰搧妫�楠屼换鍔￠」銆�
+ * 鐢� LimsQingyandanService 鍦ㄨ楠屽崟 submit 鏃舵寜鍕鹃�夌殑璐ㄩ噺鏍囧噯瀛愰」鎵归噺鐢熸垚
+ * 锛堝垵濮� jianyan_zhuangtai=created + fenjian_zhuangtai=wei_fenjian锛夛紝
+ * 缁忋�屾牱鍝佸垎妫�銆嶅姩浣滄帹杩涘埌 pending_assign銆�
+ */
+@Data
+@TableName("lims_jianyan_xiang")
+public class LimsJianyanXiangEntity {
+
+    @TableId(value = "f_id")
+    @JsonProperty("f_id")
+    @JsonAlias("id")
+    private String id;
+
+    /**
+     * 澶栭敭锛屾寚鍚戣川閲忔爣鍑嗗瓙椤� zhiliang_biaozhun_guanli_zixiang.f_id锛堟娴嬮」妯℃澘锛夈��
+     * 璇烽獙鍗� submit 鍒涘缓鏈鏃剁敱 LimsQingyandanServiceImpl.buildXiangFromQingyandan 鍐欏叆锛�
+     * 姝ゅ悗涓嶅啀鍙樻洿锛堝叏浠撳敮涓�鍐欏叆鐐癸紱鎶ュ憡鐢熸垚娴佺▼涓嶈鐩栨鍒楋級銆�
+     * 鏄弽鏌ヨ川閲忔爣鍑� / 妫�楠岄」鐩殑绋冲畾澶栭敭锛堣 LimsYichangDiaochaServiceImpl 鐨勭‘瀹氭�у弽鏌ラ摼锛夈��
+     */
+    @TableField("f_foreign_id")
+    private String foreignId;
+
+    @TableField(value = "f_tenant_id", fill = FieldFill.INSERT_UPDATE)
+    private String tenantId;
+
+    /** 璇烽獙鍗� fid */
+    @TableField("qingyandan_id")
+    private String qingyandanId;
+
+    /** 鐢熸垚鏈楠岄」鐨勬按绯荤粺鍙栨牱璁″垝浠诲姟涓婚敭 */
+    @TableField("laiyuan_renwu_id")
+    private String laiyuanRenwuId;
+
+    /** 鐢熸垚鏈楠岄」鐨勪换鍔℃楠岄」蹇収涓婚敭 */
+    @TableField("renwu_jianyan_xiang_kuaizhao_id")
+    private String renwuJianyanXiangKuaizhaoId;
+
+    /** 璇烽獙绫诲瀷 */
+    @TableField("biz_type")
+    private String bizType;
+
+    /** 妫�楠屾祦姘村彿 */
+    @TableField("jianyan_liushuihao")
+    private String jianyanLiushuihao;
+
+    /** 浜у搧 id */
+    @TableField("chanpin_id")
+    private String chanpinId;
+
+    /** 浜у搧缂栫爜 */
+    @TableField("chanpin_bianma")
+    private String chanpinBianma;
+
+    /** 浜у搧鍚嶇О */
+    @TableField("chanpin_mingcheng")
+    private String chanpinMingcheng;
+
+    /** 鎵瑰彿 */
+    @TableField("pihao")
+    private String pihao;
+
+    /** 瑙勬牸 */
+    @TableField("guige")
+    private String guige;
+
+    /** 妫�楠岄」鐩紪鐮� */
+    @TableField("jianyan_xiangmu_bianma")
+    private String jianyanXiangmuBianma;
+
+    /** 妫�楠岄」鐩悕绉� */
+    @TableField("jianyan_xiangmu_mingcheng")
+    private String jianyanXiangmuMingcheng;
+
+    /** 鍒嗘瀽绫诲瀷 / 璐ㄩ噺灞炴�э紝浠� lims_qingyandan_jiancexiang.fenxi_leixing 澶嶅埗锛堟姤鍛婂垎缁勭敤锛� */
+    @TableField("fenxi_leixing")
+    private String fenxiLeixing;
+
+    /** 鏄惁澶栨锛堜粠 lims_qingyandan_jiancexiang.shifou_waijian 澶嶅埗锛� */
+    @TableField("shifou_waijian")
+    private String shifouWaijian;
+
+    /** 鏄惁鍑哄叿鎶ュ憡锛堜粠 lims_qingyandan_jiancexiang.shifou_chuju_baogao 澶嶅埗锛屾姤鍛婃覆鏌撳墧闄� "no" 椤癸級 */
+    @TableField("shifou_chuju_baogao")
+    private String shifouChujuBaogao;
+
+    /** 澶栨妫�娴嬪崟浣嶏紙shifou_waijian=yes 鏃跺綍鍏ョ粨鏋滃繀浼狅級 */
+    @TableField("waijian_danwei")
+    private String waijianDanwei;
+
+    /** 澶栨缁撴灉褰曞叆浜猴紙shifou_waijian=yes 鏃跺綍鍏ョ粨鏋滃繀浼狅紝涓氬姟渚у～鐢ㄦ埛濮撳悕鎴栧澶栬仈绯讳汉锛� */
+    @TableField("waijian_lururen")
+    private String waijianLururen;
+
+    /** 鏍囧噯瑙勫畾 */
+    @TableField("biaozhun_guiding")
+    private String biaozhunGuiding;
+
+    /** 鏍囧噯涓婇檺锛堝垱寤烘楠岄」鏃朵粠璐ㄩ噺鏍囧噯瀛愰」鍐椾綑锛� */
+    @TableField("biaozhun_shangxian")
+    private String biaozhunShangxian;
+
+    /** 鏍囧噯涓嬮檺锛堝垱寤烘楠岄」鏃朵粠璐ㄩ噺鏍囧噯瀛愰」鍐椾綑锛� */
+    @TableField("biaozhun_xiaxian")
+    private String biaozhunXiaxian;
+
+    /** 鏁版嵁绫诲瀷锛堜粠妫�娴嬮」妯℃澘蹇収锛� */
+    @TableField("shuju_leixing")
+    private String shujuLeixing;
+
+    /** 妫�鏌ョ彮缁� */
+    @TableField("jiancha_banzu")
+    private String jianchaBanzu;
+
+    /** 妫�鏌ヤ汉锛堟楠屽憳 userId锛屽垵濮嬩负 null锛屽緟"鍒嗛厤"鍔ㄤ綔濉叆锛� */
+    @TableField("jiancha_ren")
+    private String jianchaRen;
+
+    /** 瀹屾垚鏃ユ湡锛堝鏍搁�氳繃鏃跺～鍏ワ級 */
+    @TableField("wancheng_riqi")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date wanchengRiqi;
+
+    /**
+     * 宸插彂鎻愰啋鏍囪 csv锛圖7,D3,D1,EXPIRED锛夈��
+     * daily 鎵弿鍙戝嚭姣忎釜鍒嗘敮鎻愰啋鍚庤拷鍔犲搴旀爣璁帮紱
+     * assign 鎺ュ彛鍐欏叆 wancheng_riqi 鏃朵竴寰嬬疆涓� null锛堣鍚岄噸鏂拌鏃讹級銆�
+     * 璇ュ垪鍙缃┖锛寀pdateStrategy = ALWAYS銆�
+     */
+    @TableField(value = "remind_flags", updateStrategy = FieldStrategy.ALWAYS)
+    private String remindFlags;
+
+    /** 妫�楠岀姸鎬侊紙JianyanStatus锛� */
+    @TableField("jianyan_zhuangtai")
+    private String jianyanZhuangtai;
+
+    /** 浠诲姟鍒嗛厤浜猴紙鎵ц鍒嗛厤鍔ㄤ綔鐨勫綋鍓嶇櫥褰曠敤鎴� userId锛� */
+    @TableField("renwu_fenpeiren")
+    private String renwuFenpeiren;
+
+    /** 浠诲姟鍒嗛厤鏃堕棿 */
+    @TableField("renwu_fenpei_shijian")
+    private Date renwuFenpeiShijian;
+
+    /** 妫�楠岀粨鏋滐紙鏂囧瓧 / 鏁板�兼弿杩帮級 */
+    @TableField("jianyan_jieguo")
+    private String jianyanJieguo;
+
+    /** 妫�楠岀粨璁猴紙JianyanJielun.code锛� */
+    @TableField("jianyan_jielun")
+    private String jianyanJielun;
+
+    /** 闄勪欢锛堟枃浠跺悕 / id 鍒楄〃锛屽垎闅旂鐢卞墠绔害瀹氾級 */
+    @TableField("biz_files")
+    private String bizFiles;
+
+    /** 缁撴灉褰曞叆鏃ユ湡锛坰ubmit-result 鏃跺啓鍏ョ殑褰撳墠鏃堕棿锛� */
+    @TableField("jieguo_luru_riqi")
+    private Date jieguoLuruRiqi;
+
+    /** 浠诲姟缁撴灉閫�鍥炰汉锛坅udit-fail 鏃跺啓鍏ョ殑褰撳墠鐧诲綍鐢ㄦ埛 userId锛� */
+    @TableField("renwu_tuihuiren")
+    private String renwuTuihuiren;
+
+    /** 浠诲姟閫�鍥炲師鍥狅紙鍓嶇 note 瀛楁鍐欏叆锛� */
+    @TableField("tuihui_yuanyin")
+    private String tuihuiYuanyin;
+
+    /** 浠诲姟缁撴灉褰曞叆瀹℃牳浜猴紙瀹℃牳閫氳繃鏃跺啓鍏ョ殑褰撳墠鐧诲綍鐢ㄦ埛 userId锛� */
+    @TableField("renwu_shenheren")
+    private String renwuShenheren;
+
+    /**
+     * 鍒嗘鐘舵�侊細{@code wei_fenjian} / {@code fenjian}锛堣 {@link FenjianZhuangtai}锛夈��
+     * 浠� {@code POST /lims/biz/jieyang/edit-direct} 鐩村啓璺緞鍐欏叆鐨勬楠岄」浣跨敤锛�
+     * 璧颁紶缁� {@code /jieyang/edit} + 鐝粍鎺ユ敹璺緞鐢熸垚鐨勮淇濇寔 NULL銆�
+     */
+    @TableField("fenjian_zhuangtai")
+    private String fenjianZhuangtai;
+
+    /**
+     * 鍒嗘閲忋�備粎 {@code POST /lims/biz/jieyang/edit-direct} 鐩村啓璺緞鍐欏叆锛�
+     * 鑰佽矾寰勭敓鎴愮殑琛屼繚鎸� NULL銆備笅鍚� fenjian_* 瀛楁銆�
+     */
+    @TableField("fenjian_liang")
+    private String fenjianLiang;
+
+    /** 鍒嗘鍗曚綅锛堜粎鐩村啓璺緞鍐欏叆锛� */
+    @TableField("fenjian_danwei")
+    private String fenjianDanwei;
+
+    /** 鍒嗚瀹瑰櫒锛堜粎鐩村啓璺緞鍐欏叆锛� */
+    @TableField("fenjian_fenzhuang_rongqi")
+    private String fenjianFenzhuangRongqi;
+
+    /** 鍒嗘淇濆瓨鏉′欢锛堜粎鐩村啓璺緞鍐欏叆锛� */
+    @TableField("fenjian_baocun_tiaojian")
+    private String fenjianBaocunTiaojian;
+
+    /** 鍒嗘鐜锛堜粎鐩村啓璺緞鍐欏叆锛� */
+    @TableField("fenjian_huanjing")
+    private String fenjianHuanjing;
+
+    /** 鍒嗘浜猴紙鎵ц銆屾牱鍝佸垎妫�銆嶅姩浣滅殑褰撳墠鐧诲綍鐢ㄦ埛 userId锛泂ubmit 鍒涘缓鏃朵负绌猴級 */
+    @TableField("fenjian_ren")
+    private String fenjianRen;
+
+    /** 鍒嗘鏃ユ湡锛堟墽琛屻�屾牱鍝佸垎妫�銆嶅姩浣滅殑褰撳墠鏃堕棿锛泂ubmit 鍒涘缓鏃朵负绌猴級 */
+    @TableField("fenjian_riqi")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date fenjianRiqi;
+
+    /** 寮傚父璋冩煡绫诲瀷锛堝瓧鍏� jianyanYichangDiaochaLeixing锛歯a/ad/oos/oot锛夛紝缁撴灉褰曞叆鏃跺啓鍏ワ紝瑙� {@link YichangDiaochaLeixing} */
+    @TableField("yichang_diaocha_leixing")
+    private String yichangDiaochaLeixing;
+
+    /** 鏄惁缁勫悎鍒嗘嫞锛堟牱鍝佺骇閰嶇疆锛岃楠屽崟鎻愪氦鍒涘缓妫�楠岄」鏃朵粠璐ㄩ噺鏍囧噯涓昏〃 shifou_zuhe_fenjian 澶嶅埗锛� */
+    @TableField("shifou_zuhe_fenjian")
+    private String shifouZuheFenjian;
+
+    /**
+     * 缁勫悎id锛堝悗绔敓鎴愶級銆傚悓涓�娆� {@code POST /lims/biz/jiance-task/accept} 鍒嗘璇锋眰閲岋紝
+     * 鎵�鏈� {@code shifou_zuhe_fenjian=yes} 鐨勮鍏变韩鍚屼竴涓� uuId锛涢潪缁勫悎琛屼繚鎸� NULL銆�
+     */
+    @TableField("zuhe_id")
+    private String zuheId;
+
+    /** 缁勫悎鍒嗘閲忥紙鍓嶇鍦� /accept 璇锋眰绾ф彁浜わ紱浠� shifou_zuhe_fenjian=yes 鐨勭粍鍚堣鍐欏叆锛屽墠绔紶浜嗘墠鍐欍�佷笉鏍￠獙绌猴級 */
+    @TableField("zuhe_fenjian_liang")
+    private String zuheFenjianLiang;
+
+    /** 缁勫悎鍒嗘鍗曚綅锛堝墠绔湪 /accept 璇锋眰绾ф彁浜わ紱浠� shifou_zuhe_fenjian=yes 鐨勭粍鍚堣鍐欏叆锛屽墠绔紶浜嗘墠鍐欍�佷笉鏍￠獙绌猴級 */
+    @TableField("zuhe_fenjian_danwei")
+    private String zuheFenjianDanwei;
+
+    /** 鍒犻櫎鏍囧織 */
+    @TableField("f_delete_mark")
+    private Integer deleteMark;
+
+    /** 鍒犻櫎鏃堕棿 */
+    @TableField("f_delete_time")
+    private Date deleteTime;
+
+    /** 鍒犻櫎鐢ㄦ埛 */
+    @TableField("f_delete_user_id")
+    private String deleteUserId;
+
+    /** 浠诲姟澶嶅鏃堕棿 */
+    @TableField("renwu_shenheren_shijian")
+    private Date renwuShenherenShijian;
+
+    /** 鍚堝悓鍙� */
+    @TableField("hetonghao")
+    private String hetonghao;
+
+    /** 鍚堝悓鍙� */
+    @TableField("beizhu")
+    private String beizhu;
+
+}

--
Gitblit v1.8.0