From 68f85f044cd71cd3db6514c3bf5b5129ed2e3e78 Mon Sep 17 00:00:00 2001
From: zqy <2522236926>
Date: 星期一, 10 六月 2024 23:44:50 +0800
Subject: [PATCH] 家庭小医生的分享
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 deletions(-)
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 1a6014a..afa01d1 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
@@ -13,10 +13,7 @@
import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.domain.*;
import com.ruoyi.mapper.ZfPetMapper;
-import com.ruoyi.service.ZAuthorityService;
-import com.ruoyi.service.ZInfoUserService;
-import com.ruoyi.service.ZfMasterService;
-import com.ruoyi.service.ZfPetService;
+import com.ruoyi.service.*;
import lombok.extern.slf4j.Slf4j;
import org.apache.poi.util.StringUtil;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +22,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.annotation.Resource;
+import java.time.LocalDateTime;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
@@ -67,6 +65,11 @@
//瑕佹煡鑷繁瀹跺涵鐨�
ZInfoUser myself = zInfoUserService.getMyself();
+ if(myself==null)
+ {
+ // System.out.println("ssssss");
+ return AjaxResult.success("鎮ㄦ病鍔犲叆鍒板搴旂殑瀹跺涵锛岃鑱旂郴绠＄悊鍛�");
+ }
Long familyId = myself.getFamilyId();
//涔熻鏌ュ埆浜烘巿鏉冪殑
List<ZAuthority> authority = zAuthorityService.getAuthority();
@@ -98,7 +101,7 @@
bean.setOwnData(0);
}
}
- ).collect(Collectors.toList());
+ ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
}
@@ -192,6 +195,9 @@
}
}
+ @Resource
+ ZfLogService zfLogService;
+
@Override
public AjaxResult updateData(ZfPet zfPet) {
ZInfoUser myself = zInfoUserService.getMyself();
@@ -207,6 +213,13 @@
if (dataFamilyId!=null && !familyIdList.contains(dataFamilyId)) {
throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
}
+
+ //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+ ZfLog zfLog = new ZfLog();
+ zfLog.setUpdateTime(LocalDateTime.now());
+ zfLog.setModule("榄呭疇");
+ zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+ zfLogService.save(zfLog);
if(updateById(zfPet)){
return AjaxResult.success();
@@ -300,11 +313,13 @@
LambdaQueryWrapper<ZfPet> lqw = new LambdaQueryWrapper<>();
lqw.orderByDesc(ZfPet::getCreateTime);
lqw.in(ZfPet::getFamilyId,familyIdList);
+ lqw.eq(zfPet.getId()!=null,ZfPet::getId,zfPet.getId());
lqw.like(StringUtils.isNotEmpty(zfPet.getIdNum()),ZfPet::getIdNum,zfPet.getIdNum());
lqw.like(StringUtils.isNotEmpty(zfPet.getSecurityCode()),ZfPet::getSecurityCode,zfPet.getSecurityCode());
lqw.like(StringUtils.isNotEmpty(zfPet.getType()),ZfPet::getType,zfPet.getType());
lqw.like(StringUtils.isNotEmpty(zfPet.getName()),ZfPet::getName,zfPet.getName());
- lqw.like(zfPet.getBirth()!=null,ZfPet::getBirth,zfPet.getBirth());
+// lqw.like(zfPet.getBirth()!=null,ZfPet::getBirth,zfPet.getBirth());
+ lqw.between(zfPet.getBirthStart()!=null && zfPet.getBirthEnd()!=null,ZfPet::getBirth,zfPet.getBirthStart(),zfPet.getBirthEnd());
lqw.like(zfPet.getSex()!=null,ZfPet::getSex,zfPet.getSex());
lqw.like(StringUtils.isNotEmpty(zfPet.getColor()),ZfPet::getColor,zfPet.getColor());
lqw.like(StringUtils.isNotEmpty(zfPet.getProperties()),ZfPet::getProperties,zfPet.getProperties());
--
Gitblit v1.9.1