From 38bf6d26c02f2861abdbe95b8e2a1312e6f30202 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期一, 04 十一月 2024 18:04:48 +0800
Subject: [PATCH] 删除宠物将对应的备忘本一并删除
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java | 11 ++++-------
zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java | 3 +++
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetNoteServiceImpl.java | 14 ++++++++++++--
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java b/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
index 9edaa01..be1f75f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZfPetNoteService.java
@@ -1,6 +1,7 @@
package com.ruoyi.service;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.domain.ZfPetNote;
@@ -23,6 +24,8 @@
AjaxResult getAllPetNoteByPetId(Integer pageNum,Integer pageSize,String pid,ZfPetNote zfPetNote);
+ List<ZfPetNote> getPetNoteByPetId(String pid);
+
AjaxResult mySave(ZfPetNote zfPetNote);
List<ZfPetNote> selectByIds(Long[] ids);
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 8066de9..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
@@ -51,20 +51,30 @@
return list;
}
+
+
@Override
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) {
//鍒ゆ柇鏄惁鏈夐噸澶嶆暟鎹�
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
index df53fa7..a0f7b05 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java
@@ -51,10 +51,8 @@
ZAuthorityService zAuthorityService;
@Resource
- ZfPetSharService zfPetSharService;
+ ZfPetNoteService zfPetNoteService;
- @Resource
- ZfPetDownlService zfPetDownlService;
@Override
public AjaxResult selectDataList(ZfPet zfPet, Integer pageNum, Integer pageSize) {
// LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet);
@@ -79,7 +77,7 @@
fatherFaId = zInfoUserService.getInfoById(myself.getFatherId()).getFamilyId();
Long motherFaId = 0L;
if(myself.getMomId()!=null)
- motherFaId = zInfoUserService.getInfoById(myself.getMomId()).getFamilyId();
+ motherFaId = zInfoUserService.getInfoBysysId(myself.getMomId()).getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -271,9 +269,8 @@
if (!familyIdList.contains(data.getFamilyId())){
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
- }
- if (! (zfPetDownlService.deleteData(ids) && zfPetSharService.deleteByContentId(ids) ) ){
- return AjaxResult.error();
+ if (!zfPetNoteService.removeBatchByIds(zfPetNoteService.getPetNoteByPetId(data.getId())))
+ return AjaxResult.error();
}
if (zfPetService.removeByIds(Arrays.asList(ids))) {
--
Gitblit v1.9.1