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/LimsJianyanXiangServiceImpl.java | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsJianyanXiangServiceImpl.java b/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsJianyanXiangServiceImpl.java
new file mode 100644
index 0000000..8de23d8
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/limsService/impl/LimsJianyanXiangServiceImpl.java
@@ -0,0 +1,35 @@
+package jnpf.limsService.impl;
+
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import jnpf.audit.sdk.annotation.AuditLog;
+import jnpf.base.service.SuperServiceImpl;
+import jnpf.limsEntity.JianyanStatus;
+import jnpf.limsEntity.LimsJianyanXiangEntity;
+import jnpf.limsMapper.LimsJianyanXiangMapper;
+import jnpf.limsService.LimsJianyanXiangService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class LimsJianyanXiangServiceImpl
+ extends SuperServiceImpl<LimsJianyanXiangMapper, LimsJianyanXiangEntity>
+ implements LimsJianyanXiangService {
+
+ @Override
+ @AuditLog(
+ action = "RESULT_CANCEL", label = "鎾ゅ洖妫�楠岄」缁撴灉", bizType = "JIANCE_TASK",
+ bizCodeExpr = "#result ? #id : ''",
+ targetTable = "lims_jianyan_xiang", targetIdExpr = "#id",
+ diff = true, entityClass = LimsJianyanXiangEntity.class
+ )
+ public boolean cancelResult(String id) {
+ if (id == null || id.isEmpty()) {
+ return false;
+ }
+ UpdateWrapper<LimsJianyanXiangEntity> uw = new UpdateWrapper<>();
+ uw.eq("f_id", id);
+ uw.eq("jianyan_zhuangtai", JianyanStatus.PENDING_AUDIT.getCode());
+ uw.and(w -> w.isNull("f_delete_mark").or().ne("f_delete_mark", 1));
+ uw.set("jianyan_zhuangtai", JianyanStatus.CANCELLED.getCode());
+ return this.update(uw);
+ }
+}
--
Gitblit v1.8.0