From b5da9c2985bd3e131f9b174fdf9ad2bbf7b30c6f Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 01 八月 2023 22:41:52 +0800
Subject: [PATCH] 25616
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java | 11 +++++++++++
1 files changed, 11 insertions(+), 0 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..ab72019 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
@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ZProperty;
import com.ruoyi.domain.ZProperty;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZPropertyMapper;
import com.ruoyi.service.ZPropertyService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,6 +60,7 @@
.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.getTimeLimit()),ZProperty::getTimeLimit,zProperty.getTimeLimit())
.between(zProperty.getHappenStartTime() != null && zProperty.getHappenEndTime() != null, ZProperty::getHappenTime, zProperty.getHappenStartTime(), zProperty.getHappenEndTime())
.orderByDesc(ZProperty::getCreateTime);
return lqw;
@@ -116,6 +118,15 @@
}
@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
@Transactional
public AjaxResult importExcel(MultipartFile file) {
--
Gitblit v1.9.1