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-biz/src/main/java/jnpf/limsService/impl/LimsSxtRenwuQingyandanZhuangtaiTongbuService.java |   64 ++++++++++++++++++++++++++++++++
 1 files changed, 64 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsSxtRenwuQingyandanZhuangtaiTongbuService.java b/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsSxtRenwuQingyandanZhuangtaiTongbuService.java
new file mode 100644
index 0000000..52a7a49
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsSxtRenwuQingyandanZhuangtaiTongbuService.java
@@ -0,0 +1,64 @@
+package jnpf.limsService.impl;
+
+import com.alibaba.fastjson.JSON;
+import jnpf.base.UserInfo;
+import jnpf.limsEntity.LimsQingyandanEntity;
+import jnpf.limsEntity.LimsSxtQuyangJihuaRenwuEntity;
+import jnpf.limsEntity.LimsSxtQuyangJihuaRenwuShijianEntity;
+import jnpf.limsMapper.LimsSxtQuyangJihuaRenwuMapper;
+import jnpf.limsMapper.LimsSxtQuyangJihuaRenwuShijianMapper;
+import jnpf.util.RandomUtil;
+import jnpf.util.UserProvider;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
+
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * 璇烽獙鍗曞彉鏇村悗鐨勪换鍔″唴鐘舵�佸壇鏈悓姝ュ櫒銆傜湅鏉垮彧璇诲彇 Renwu锛屼笉鑳藉弽鍚戣仈鏌ヨ楠屽崟銆�
+ */
+@Service
+public class LimsSxtRenwuQingyandanZhuangtaiTongbuService {
+
+    @Autowired
+    private LimsSxtQuyangJihuaRenwuMapper renwuMapper;
+    @Autowired
+    private LimsSxtQuyangJihuaRenwuShijianMapper shijianMapper;
+
+    public void tongbu(LimsQingyandanEntity qingyandan, String shijianLeixing) {
+        if (qingyandan == null || !StringUtils.hasText(qingyandan.getLaiyuanRenwuId())) {
+            return;
+        }
+        LimsSxtQuyangJihuaRenwuEntity renwu = renwuMapper.selectById(qingyandan.getLaiyuanRenwuId());
+        if (renwu == null || !qingyandan.getId().equals(renwu.getQingyandanId())) {
+            return;
+        }
+        String zhuangtai = "deleted".equals(qingyandan.getQuyangStatus())
+                ? "deleted" : qingyandan.getBizStatus();
+        if (renwuMapper.tongbuQingyandanZhuangtai(renwu.getId(), qingyandan.getId(), zhuangtai) != 1) {
+            return;
+        }
+        Map<String, Object> shuju = new LinkedHashMap<>();
+        shuju.put("biz_status", qingyandan.getBizStatus());
+        shuju.put("quyang_status", qingyandan.getQuyangStatus());
+        shuju.put("jieyang_status", qingyandan.getJieyangStatus());
+        shuju.put("qingyandan_zhuangtai", zhuangtai);
+        LimsSxtQuyangJihuaRenwuShijianEntity shijian = new LimsSxtQuyangJihuaRenwuShijianEntity();
+        shijian.setId(RandomUtil.uuId());
+        shijian.setFTenantId(renwu.getFTenantId());
+        shijian.setRenwuId(renwu.getId());
+        shijian.setRenwuShiliId(renwu.getRenwuShiliId());
+        shijian.setShijianLeixing(shijianLeixing);
+        shijian.setFashengShijian(new Date());
+        UserInfo user = UserProvider.getUser();
+        shijian.setCaozuoRenId(user == null ? null : user.getUserId());
+        shijian.setCaozuoLeixing(user == null ? "system" : "user");
+        shijian.setGuanlianQingyandanId(qingyandan.getId());
+        shijian.setXinKuaizhaoHaxi(renwu.getKuaizhaoHaxi());
+        shijian.setShijianShuju(JSON.toJSONString(shuju));
+        shijianMapper.insertShijian(shijian);
+    }
+}

--
Gitblit v1.8.0