From 3f50e9e810b478dbbd3225d9e5cedf47f586b69b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 05 九月 2023 11:25:43 +0800
Subject: [PATCH] 45386
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java | 27 +++++++++++++++++++++++----
1 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
index a9bd871..c4abfff 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java
@@ -10,11 +10,14 @@
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfPet;
import com.ruoyi.domain.ZfPetNote;
+import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPetNoteMapper;
import com.ruoyi.service.ZfPetNoteService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
@@ -36,7 +39,9 @@
lqw.orderByDesc(ZfPetNote::getCreateTime);
Page<ZfPetNote> ZfPetNotePage = new Page<>(pageNum,pageSize);
Page<ZfPetNote> pageResult = page(ZfPetNotePage, lqw);
+ System.out.println(pageResult);
HashMap<String, Object> data = MapUtils.getResult(pageResult);
+ System.out.println(data);
return AjaxResult.success(data);
}
@@ -50,12 +55,16 @@
}
@Override
- public AjaxResult getAllPetNoteByPetId(String pid) {
- LambdaQueryWrapper<ZfPetNote> lqw = new LambdaQueryWrapper<>();
+ public AjaxResult getAllPetNoteByPetId(Integer pageNum,Integer pageSize,String pid,ZfPetNote zfPetNote) {
+ LambdaQueryWrapper<ZfPetNote> lqw = buildCondition(zfPetNote);
lqw.eq(ZfPetNote::getPid,pid);
lqw.orderByDesc(ZfPetNote::getCreateTime);
- List<ZfPetNote> list = list(lqw);
- return AjaxResult.success(list);
+
+ Page<ZfPetNote> zfPetNotePage = new Page<>(pageNum, pageSize);
+ Page<ZfPetNote> pageResult = page(zfPetNotePage, lqw);
+
+ HashMap<String, Object> result = MapUtils.getResult(pageResult);
+ return AjaxResult.success(result);
}
@Override
@@ -75,6 +84,16 @@
}
}
+ @Override
+ public List<ZfPetNote> selectByIds(Long[] ids) {
+ List<ZfPetNote> list = new ArrayList<>();
+ if(ids.length!=0)
+ list = listByIds(Arrays.asList(ids));
+ else
+ list = list();
+ return list;
+ }
+
private LambdaQueryWrapper<ZfPetNote> uniqueCondition(ZfPetNote zfPetNote) {
LambdaQueryWrapper<ZfPetNote> lqw = new LambdaQueryWrapper<>();
lqw.eq(StringUtils.isNotEmpty(zfPetNote.getTitle()),ZfPetNote::getTitle,zfPetNote.getTitle());
--
Gitblit v1.9.1