From 40662806c2738a259edb87761b3ac3ae4a0001c4 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期四, 07 十二月 2023 16:16:21 +0800
Subject: [PATCH] #答题日志数据转换 字段映射修改
---
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
index f8397d5..ee1ecca 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/ProblemLogServiceImpl.java
@@ -19,7 +19,7 @@
/**
* 璁垮绛旈璁板綍琛⊿ervice瀹炵幇
* @author 姹熻箘韫�
- * @date 2023/11/23 18:16
+ * @date 2023/11/30 15:33
*/
@Service
public class ProblemLogServiceImpl implements ProblemLogService {
@@ -83,7 +83,7 @@
QueryWrapper<ProblemLog> wrapper = new QueryWrapper<>(problemLog);
return problemLogMapper.selectList(wrapper);
}
-
+
@Override
public PageData<ProblemLog> findPage(PageWrap<ProblemLog> pageWrap) {
IPage<ProblemLog> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
@@ -127,13 +127,23 @@
if (pageWrap.getModel().getContent() != null) {
queryWrapper.lambda().eq(ProblemLog::getContent, pageWrap.getModel().getContent());
}
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
- }
+ if (pageWrap.getModel().getName() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getName, pageWrap.getModel().getName());
}
+ if (pageWrap.getModel().getPhone() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getPhone, pageWrap.getModel().getPhone());
+ }
+ if (pageWrap.getModel().getCompanyId() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getCompanyId, pageWrap.getModel().getCompanyId());
+ }
+ if (pageWrap.getModel().getCompanyName() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getCompanyName, pageWrap.getModel().getCompanyName());
+ }
+ if (pageWrap.getModel().getOpenid() != null) {
+ queryWrapper.lambda().eq(ProblemLog::getOpenid, pageWrap.getModel().getOpenid());
+ }
+ queryWrapper.select("problem_log.*,(select type from member where member.openid = problem_log.openid) as type");
+ queryWrapper.orderByAsc("problem_log.createDate");
return PageData.from(problemLogMapper.selectPage(page, queryWrapper));
}
--
Gitblit v1.9.3