From a2e4f4e2aad027c72799588ec2a4deac73779e17 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期日, 27 八月 2023 19:43:44 +0800
Subject: [PATCH] 815646
---
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 14 ++++++++++++++
zhang-content/src/main/java/com/ruoyi/domain/dto/PriceDto.java | 6 ++++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java | 3 +++
3 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/dto/PriceDto.java b/zhang-content/src/main/java/com/ruoyi/domain/dto/PriceDto.java
index d247810..f958e77 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/dto/PriceDto.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/dto/PriceDto.java
@@ -29,6 +29,12 @@
private String title;
+ private String property;
+
+ private String tableName;
+
+ private String type;
+
private List<ZTravelPriceDetail> detailList;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index b4c060e..279e37a 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -444,6 +444,20 @@
}
}
+ if(genealogy.getPhoneNumber()!=null){
+ if(data.getPhoneNumber()!=genealogy.getPhoneNumber()){
+ it.remove();
+ continue;
+ }
+ }
+
+ if(genealogy.getUnit()!=null){
+ if(data.getUnit()!=genealogy.getUnit()){
+ it.remove();
+ continue;
+ }
+ }
+
if(genealogy.getBirth()!=null){
if(data.getBirth().compareTo(genealogy.getBirth())!=0){
it.remove();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
index 2d32cbc..3955b20 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java
@@ -325,6 +325,9 @@
zTravelPrice.setEndTime(priceDto.getEndTime());
zTravelPrice.setTotalDay(totalDay);
zTravelPrice.setTitle(priceDto.getTitle());
+ zTravelPrice.setTableName(priceDto.getTableName());
+ zTravelPrice.setProperty(priceDto.getProperty());
+ zTravelPrice.setType(priceDto.getType());
zTravelPrice.setEat(eatTotal);
zTravelPrice.setStay(stayTotal);
zTravelPrice.setTraffic(trafficTotal);
--
Gitblit v1.9.1