From 35924055a41e1505aceacef503fd3cfa7a064a36 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 26 八月 2025 20:24:03 +0800
Subject: [PATCH] Merge branch 'master' of http://47.93.189.255:8099/r/zhangshi_app_backend
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 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 f95d34b..85a87de 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
@@ -7,14 +7,14 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.MapUtils;
import com.ruoyi.common.utils.StringUtils;
-import com.ruoyi.domain.ZfEvent;
-import com.ruoyi.domain.ZfPet;
import com.ruoyi.domain.ZfPetNote;
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;
@@ -51,17 +51,27 @@
return list;
}
+
+
@Override
- public AjaxResult getAllPetNoteByPetId(Integer pageNum,Integer pageSize,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);
-
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
+ public List<ZfPetNote> getPetNoteByPetId(String pid ) {
+ ZfPetNote zfPetNote = new ZfPetNote();
+ zfPetNote.setPid(pid);
+ LambdaQueryWrapper<ZfPetNote> lqw = buildCondition(zfPetNote);
+ lqw.eq(ZfPetNote::getPid,pid);
+ lqw.orderByDesc(ZfPetNote::getCreateTime);
+ return list(lqw);
}
@Override
@@ -81,6 +91,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