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/ZPropertyServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
index 3aabe7e..2d63a06 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZProperty;
-import com.ruoyi.domain.ZProperty;
import com.ruoyi.mapper.ZPropertyMapper;
import com.ruoyi.service.ZPropertyService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -19,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;
@@ -37,6 +37,9 @@
@Autowired
ZPropertyServiceImpl zPropertyService;
+
+ @Resource
+ ZPropertyMapper zPropertyMapper;
private LambdaQueryWrapper<ZProperty> uniqueCondition(ZProperty zProperty) {
LambdaQueryWrapper<ZProperty> lqw = new LambdaQueryWrapper<>();
@@ -58,7 +61,11 @@
lqw.eq(userId != null, ZProperty::getUserId, userId)
.like(StringUtils.isNotEmpty(zProperty.getType()), ZProperty::getType, zProperty.getType())
.like(StringUtils.isNotEmpty(zProperty.getIncomeName()), ZProperty::getIncomeName, zProperty.getIncomeName())
- .eq(zProperty.getIsChange()!=null,ZProperty::getIsChange,zProperty.getIsChange())
+ .like(StringUtils.isNotEmpty(zProperty.getType()), ZProperty::getType, zProperty.getType())
+ .like(StringUtils.isNotEmpty(zProperty.getIsChange()),ZProperty::getIsChange,zProperty.getIsChange())
+ .like(StringUtils.isNotEmpty(zProperty.getRemark()), ZProperty::getRemark, zProperty.getRemark())
+ .like(StringUtils.isNotEmpty(zProperty.getTimeLimit()),ZProperty::getTimeLimit,zProperty.getTimeLimit())
+ .eq(zProperty.getStatus()!=null,ZProperty::getStatus,zProperty.getStatus())
.between(zProperty.getHappenStartTime() != null && zProperty.getHappenEndTime() != null, ZProperty::getHappenTime, zProperty.getHappenStartTime(), zProperty.getHappenEndTime())
.orderByDesc(ZProperty::getCreateTime);
return lqw;
@@ -116,6 +123,21 @@
}
@Override
+ public List<ZProperty> selectByCondition() {
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ ZProperty zProperty = new ZProperty();
+ LambdaQueryWrapper<ZProperty> lqw = buildCondition(zProperty, userId);
+ return list(lqw);
+ }
+
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zPropertyMapper.listType();
+ return AjaxResult.success(result);
+ }
+
+ @Override
@Transactional
public AjaxResult importExcel(MultipartFile file) {
--
Gitblit v1.9.1