From b02beccf4567068cb47a3f1181a00039456c872d Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期三, 06 八月 2025 15:37:20 +0800
Subject: [PATCH] 用户修改姓名和电话同步修改uaid

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java |   68 ++++++++++++++++++++++++++++++++--
 1 files changed, 64 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..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
@@ -13,6 +13,8 @@
 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;
 
@@ -31,34 +33,92 @@
     @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 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
+    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();
+        }
+    }
+
+    @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());
+        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