From 9c7fecca73c1064d9cd8ba324a386bf03adf0996 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 20 八月 2023 22:15:15 +0800
Subject: [PATCH] 51876
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 4015611..0650dcd 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -49,6 +49,9 @@
@Resource
ZAuthorityService zAuthorityService;
+ @Resource
+ ZfPropertyMapper zfPropertyMapper;
+
// private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty) {
// LambdaQueryWrapper<ZfProperty> lqw = new LambdaQueryWrapper<>();
@@ -77,7 +80,6 @@
.in(ZfProperty::getFamilyId,familyIdList)
.eq(zfProperty.getHappenTime()!=null,ZfProperty::getHappenTime,zfProperty.getHappenTime())
.between(zfProperty.getHappenStartTime() != null && zfProperty.getHappenEndTime() != null, ZfProperty::getHappenTime, zfProperty.getHappenStartTime(), zfProperty.getHappenEndTime());
-
lqw.orderByDesc(ZfProperty::getCreateTime);
return lqw;
@@ -499,6 +501,12 @@
}
+ @Override
+ public AjaxResult listType() {
+ List<String> result = zfPropertyMapper.listType();
+ return AjaxResult.success(result);
+ }
+
}
--
Gitblit v1.9.1