From 8d21a2ee4d863a3422a1def79b9f1928c00d22aa Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期日, 22 六月 2025 23:20:27 +0800
Subject: [PATCH] 没生效 重新上传
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
index 18c3300..baa26ae 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSecretServiceImpl.java
@@ -11,8 +11,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZSecret;
-import com.ruoyi.domain.ZSecret;
-import com.ruoyi.domain.ZfEvent;
import com.ruoyi.mapper.ZSecretMapper;
import com.ruoyi.service.ZSecretService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +18,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
+import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -38,6 +37,9 @@
@Autowired
ZSecretServiceImpl zSecretService;
+
+ @Resource
+ ZSecretMapper zSecretMapper;
private LambdaQueryWrapper<ZSecret> uniqueCondition(ZSecret zSecret) {
LambdaQueryWrapper<ZSecret> lqw = new LambdaQueryWrapper<>();
@@ -61,6 +63,7 @@
.like(StringUtils.isNotEmpty(zSecret.getLocation()), ZSecret::getLocation, zSecret.getLocation())
.eq(zSecret.getIsFinger()!=null,ZSecret::getIsFinger,zSecret.getIsFinger())
.eq(zSecret.getIsPrivate()!=null,ZSecret::getIsPrivate,zSecret.getIsPrivate())
+ .le(zSecret.getValidityDate()!=null, ZSecret::getValidityDate, zSecret.getValidityDate())
.eq(zSecret.getIsFace()!=null,ZSecret::getIsFace,zSecret.getIsFace())
.between(zSecret.getHappenStartTime() != null && zSecret.getHappenEndTime() != null, ZSecret::getHappenTime, zSecret.getHappenStartTime(), zSecret.getHappenEndTime())
.orderByDesc(ZSecret::getCreateTime);
@@ -130,6 +133,12 @@
}
@Override
+ public AjaxResult listType() {
+ List<String> result = zSecretMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
--
Gitblit v1.9.1