From 7db4eee0f9bdf3c34408e6e5448cb57e1811662c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 07 十二月 2023 15:21:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
index f039e1e..532bac6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemsServiceImpl.java
@@ -83,7 +83,7 @@
QueryWrapper<Problems> wrapper = new QueryWrapper<>(problems);
return problemsMapper.selectList(wrapper);
}
-
+
@Override
public PageData<Problems> findPage(PageWrap<Problems> pageWrap) {
IPage<Problems> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -133,13 +133,8 @@
if (pageWrap.getModel().getUseType() != null) {
queryWrapper.lambda().eq(Problems::getUseType, pageWrap.getModel().getUseType());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
- }
+ queryWrapper.lambda().orderByAsc(Problems::getCreateDate);
+ queryWrapper.select("problems.*, (select REALNAME from system_user where system_user.id = problems.CREATOR) as creatorName");
return PageData.from(problemsMapper.selectPage(page, queryWrapper));
}
@@ -148,4 +143,10 @@
QueryWrapper<Problems> wrapper = new QueryWrapper<>(problems);
return problemsMapper.selectCount(wrapper);
}
+
+ @Override
+ public List<Problems> findListByUseType(Integer useType) {
+
+ return null;
+ }
}
--
Gitblit v1.9.3