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-eln/jnpf-eln-biz/src/main/java/jnpf/elnMapper/ElnDianziJiluMubanMapper.java |   27 +++++++++++++++++++++++++++
 1 files changed, 27 insertions(+), 0 deletions(-)

diff --git a/jnpf-eln/jnpf-eln-biz/src/main/java/jnpf/elnMapper/ElnDianziJiluMubanMapper.java b/jnpf-eln/jnpf-eln-biz/src/main/java/jnpf/elnMapper/ElnDianziJiluMubanMapper.java
new file mode 100644
index 0000000..00fffda
--- /dev/null
+++ b/jnpf-eln/jnpf-eln-biz/src/main/java/jnpf/elnMapper/ElnDianziJiluMubanMapper.java
@@ -0,0 +1,27 @@
+package jnpf.elnMapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+
+@Mapper
+public interface ElnDianziJiluMubanMapper {
+
+    @Select("SELECT muban_file "
+            + "FROM eln_dianzi_jilu_muban_guanli "
+            + "WHERE f_tenant_id = #{tenantId} "
+            + "AND jianyan_xiangmu = #{jianyanXiangmu} "
+            + "AND COALESCE(f_delete_mark, 0) = 0 "
+            + "AND biz_enabled = 'enabled' "
+            + "AND shengxiao_riqi IS NOT NULL "
+            + "AND shengxiao_riqi <= CURRENT_TIMESTAMP "
+            + "AND muban_file IS NOT NULL "
+            + "AND TRIM(muban_file) <> '' "
+            + "ORDER BY shengxiao_riqi DESC, "
+            + "CASE WHEN chuangjian_shijian IS NULL THEN 1 ELSE 0 END, "
+            + "chuangjian_shijian DESC, f_id DESC")
+    IPage<String> selectLatestMubanFiles(IPage<String> page,
+                                         @Param("tenantId") String tenantId,
+                                         @Param("jianyanXiangmu") String jianyanXiangmu);
+}

--
Gitblit v1.8.0