From 2bcbf32c439a5d7fbb20234b86e410347d5b806f Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期六, 15 四月 2023 16:04:48 +0800
Subject: [PATCH] 456
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZfPetServiceImpl.java | 3 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java | 1
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 1
zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java | 10 ++++-
zhang-content/src/main/java/com/ruoyi/domain/dto/ZfPropertyDto.java | 5 ++
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 56 ++++++++++-----------------
6 files changed, 38 insertions(+), 38 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java
index 4a196cb..7096e0b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfPetController.java
@@ -44,7 +44,6 @@
return zfPetService.selectPetList(zfPet, pageNum, pageSize);
}
-
/**
* 瀵煎嚭榄呭疇璁板綍鍒楄〃
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
index 7cba7ea..9ae3d69 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZfPet.java
@@ -82,15 +82,21 @@
/**
* 楗涔犳儻
*/
- @Excel(name = "楗涔犳儻")
+ @Excel(name = "楗涔犳儻(鍠滃ソ)")
private String eatHabit;
/**
* 鐢熸椿涔犳儻
*/
- @Excel(name = "鐢熸椿涔犳儻")
+ @Excel(name = "鐢熸椿涔犳儻(鍠滃ソ)")
private String lifeHabit;
+ @Excel(name = "楗涔犳儻(鍘屾伓)")
+ private String disEatHabit;
+
+ @Excel(name = "鐢熸椿涔犳儻(鍘屾伓)")
+ private String disLifeHabit;
+
/**
* 鐘眳浣忓湴鍧�
*/
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/ZfPropertyDto.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/ZfPropertyDto.java
index 29e024c..ac4fec5 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/ZfPropertyDto.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/ZfPropertyDto.java
@@ -65,6 +65,11 @@
private String url;
/**
+ * 鏈潯鏁版嵁鎵�灞炰簬鐨勫搴�
+ */
+ private String familyId;
+
+ /**
* 鏄惁鏄湰瀹跺涵鐨勬暟鎹�(0:涓嶆槸,1:鏄�)
*/
private Integer ownData = 0;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 8f27f1b..92428e1 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -84,24 +84,7 @@
//閫楀彿闅斿紑寰楀埌濡備笅涓诧細3{2007 2018 2015}
String[] authorityList = secondFamilyAuthority.split(",");
for (String authorityAndId : authorityList) {
-
- //寰楀埌鏉冮檺涓�
- String authorities = authorityAndId.substring(2, authorityAndId.length() - 1);
-
- if (authorities.contains(" ")) {
- //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
- String[] authorityIdList = authorities.split(" ");
- for (String s : authorityIdList) {
- if (s.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
- break;
- }
- }
- } else {
- if (authorities.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
- }
- }
+ setSecondFamilyAuthority(secondFamilyIdsBuffer, authorityAndId);
}
//鎶婂悗闈㈢殑閫楀彿鍘绘帀
@@ -110,31 +93,15 @@
}
}else{
- String authorities = secondFamilyAuthority.substring(2, secondFamilyAuthority.length() - 1);
- if (authorities.contains(" ")) {
- //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
- String[] authorityIdList = authorities.split(" ");
- for (String s : authorityIdList) {
- if (s.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(secondFamilyAuthority.charAt(0)).append(",");
- break;
- }
- }
- } else {
- if (authorities.equals(PROPERTY_LIST)) {
- secondFamilyIdsBuffer.append(secondFamilyAuthority.charAt(0)).append(",");
- }
- }
+ setSecondFamilyAuthority(secondFamilyIdsBuffer, secondFamilyAuthority);
//鎶婂悗闈㈢殑閫楀彿鍘绘帀
if (secondFamilyIdsBuffer.length() > 1) {
secondFamilyIdsBuffer.deleteCharAt(secondFamilyIdsBuffer.length() - 1);
}
}
-
}
//灏哠tringBuffer杞垚String
String secondFamilyIds = secondFamilyIdsBuffer.toString();
-
//绗竴瀹跺涵鍙风殑鏉′欢
if (familyIds.contains(",")) {
@@ -183,6 +150,25 @@
return lqw;
}
+ private void setSecondFamilyAuthority(StringBuilder secondFamilyIdsBuffer, String authorityAndId) {
+ //寰楀埌鏉冮檺涓�
+ String authorities = authorityAndId.substring(2, authorityAndId.length() - 1);
+
+ if (authorities.contains(" ")) {
+ //绌烘牸闅斿紑寰楀埌鑿滃崟id锛岀湅鏄惁鏈夊搴旂殑鏉冮檺
+ String[] authorityIdList = authorities.split(" ");
+ for (String s : authorityIdList) {
+ if (s.equals(PROPERTY_LIST)) {
+ secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+ break;
+ }
+ }
+ } else {
+ if (authorities.equals(PROPERTY_LIST)) {
+ secondFamilyIdsBuffer.append(authorityAndId.charAt(0)).append(",");
+ }
+ }
+ }
private ZInfoUser getMySelf() {
SysUser user = SecurityUtils.getLoginUser().getUser();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index 24d293a..ff09580 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -31,6 +31,7 @@
@Override
public AjaxResult selectDoctorList(ZfDoctor zfDoctor, Integer pageNum, Integer pageSize) {
LambdaQueryWrapper<ZfDoctor> lqw = buildCondition(zfDoctor);
+ lqw.orderByDesc(ZfDoctor::getId);
Page<ZfDoctor> ZfDoctorPage = new Page<>(pageNum,pageSize);
Page<ZfDoctor> pageResult = page(ZfDoctorPage, lqw);
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 4fb767a..0f9a065 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
@@ -32,6 +32,7 @@
@Override
public AjaxResult selectPetList(ZfPet zfPet, Integer pageNum, Integer pageSize) {
LambdaQueryWrapper<ZfPet> lqw = buildCondition(zfPet);
+ lqw.orderByDesc(ZfPet::getId);
Page<ZfPet> ZfPetPage = new Page<>(pageNum,pageSize);
Page<ZfPet> pageResult = page(ZfPetPage, lqw);
HashMap<String, Object> data = MapUtils.getResult(pageResult);
@@ -60,6 +61,8 @@
lqw.like(StringUtils.isNotEmpty(zfPet.getLifeHabit()),ZfPet::getLifeHabit,zfPet.getLifeHabit());
lqw.like(StringUtils.isNotEmpty(zfPet.getAddress()),ZfPet::getAddress,zfPet.getAddress());
lqw.like(StringUtils.isNotEmpty(zfPet.getDialect()),ZfPet::getDialect,zfPet.getDialect());
+ lqw.like(StringUtils.isNotEmpty(zfPet.getDisEatHabit()),ZfPet::getDisEatHabit,zfPet.getDisEatHabit());
+ lqw.like(StringUtils.isNotEmpty(zfPet.getDisLifeHabit()),ZfPet::getDisLifeHabit,zfPet.getDisLifeHabit());
return lqw;
}
}
--
Gitblit v1.9.1