From dfdd4bd5d112a17ccd1483ad11fe023817d54d26 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期六, 22 七月 2023 15:20:13 +0800
Subject: [PATCH] 45648
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java | 48 ++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 44 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 f719a0e..74f6489 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,6 +7,8 @@
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;
@@ -31,34 +33,72 @@
@Override
public AjaxResult selectPetNoteList(ZfPetNote zfPetNote, Integer pageNum, Integer pageSize) {
LambdaQueryWrapper<ZfPetNote> lqw = buildCondition(zfPetNote);
+ 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);
}
@Override
public List<ZfPetNote> selectByCondition(ZfPetNote zfPetNote) {
LambdaQueryWrapper<ZfPetNote> lambdaQueryWrapper = buildCondition(zfPetNote);
+ lambdaQueryWrapper.orderByDesc(ZfPetNote::getCreateTime);
List<ZfPetNote> list = list(lambdaQueryWrapper);
log.info("杩斿洖鐨勬暟鎹负:{}",list);
return list;
}
@Override
- public AjaxResult getAllPetNoteByPetId(Long 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 AjaxResult mySave(ZfPetNote zfPetNote) {
+
+ //鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
+ LambdaQueryWrapper<ZfPetNote> lqw = uniqueCondition(zfPetNote);
List<ZfPetNote> list = list(lqw);
- return AjaxResult.success(list);
+ if(list.size()>0){
+ throw new RuntimeException("璇峰嬁鏂板閲嶅鏁版嵁");
+ }
+
+ if(save(zfPetNote)){
+ return AjaxResult.success();
+ }else {
+ return AjaxResult.error();
+ }
+ }
+
+ private LambdaQueryWrapper<ZfPetNote> uniqueCondition(ZfPetNote zfPetNote) {
+ LambdaQueryWrapper<ZfPetNote> lqw = new LambdaQueryWrapper<>();
+ lqw.eq(StringUtils.isNotEmpty(zfPetNote.getTitle()),ZfPetNote::getTitle,zfPetNote.getTitle());
+ lqw.eq(zfPetNote.getRemindTime()!=null,ZfPetNote::getRemindTime,zfPetNote.getRemindTime());
+ lqw.eq(zfPetNote.getHappenTime()!=null,ZfPetNote::getHappenTime,zfPetNote.getHappenTime());
+ lqw.eq(StringUtils.isNotEmpty(zfPetNote.getRemark()),ZfPetNote::getRemark,zfPetNote.getRemark());
+ return lqw;
}
private LambdaQueryWrapper<ZfPetNote> buildCondition(ZfPetNote zfPetNote) {
LambdaQueryWrapper<ZfPetNote> lqw = new LambdaQueryWrapper<>();
lqw.like(StringUtils.isNotEmpty(zfPetNote.getTitle()),ZfPetNote::getTitle,zfPetNote.getTitle());
- lqw.like(zfPetNote.getCreateTime()!=null,ZfPetNote::getCreateTime,zfPetNote.getCreateTime());
lqw.like(zfPetNote.getRemindTime()!=null,ZfPetNote::getRemindTime,zfPetNote.getRemindTime());
lqw.like(StringUtils.isNotEmpty(zfPetNote.getRemark()),ZfPetNote::getRemark,zfPetNote.getRemark());
+ lqw.eq(zfPetNote.getHappenTime()!=null,ZfPetNote::getHappenTime,zfPetNote.getHappenTime());
+ lqw.eq(zfPetNote.getRemindTime()!=null,ZfPetNote::getRemindTime,zfPetNote.getRemindTime());
+ lqw.between(zfPetNote.getHappenStartTime() != null && zfPetNote.getHappenEndTime() != null, ZfPetNote::getHappenTime, zfPetNote.getHappenStartTime(), zfPetNote.getHappenEndTime());
+ lqw.between(zfPetNote.getRemindStartTime() != null && zfPetNote.getRemindEndTime() != null, ZfPetNote::getRemindTime, zfPetNote.getRemindStartTime(), zfPetNote.getRemindEndTime());
return lqw;
}
}
--
Gitblit v1.9.1