From 627a31505ddd81c542a9a2c4b8ed114eee176a54 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 01 八月 2023 22:32:26 +0800
Subject: [PATCH] 56486
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java | 2 ++
zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java | 1 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelPriceServiceImpl.java | 8 +++++++-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java | 2 +-
zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java | 5 +++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java | 1 +
ruoyi-admin/src/main/resources/application.yml | 4 ++--
ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java | 4 ++--
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java | 2 +-
11 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
index 6159e82..01a0d56 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZHonorController.java
@@ -61,7 +61,7 @@
/**
* 妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getModel(HttpServletResponse response){
ZHonor zHonor = new ZHonor();
List<ZHonor> emptyList = Collections.singletonList(zHonor);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
index d90baaa..ff7e7a5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZIdeaController.java
@@ -60,7 +60,7 @@
/**
* 妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getModel(HttpServletResponse response){
ZIdea zIdea = new ZIdea();
List<ZIdea> emptyList = Collections.singletonList(zIdea);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
index 8b60c42..e3c2398 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZPropertyController.java
@@ -60,7 +60,7 @@
/**
* 妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getModel(HttpServletResponse response){
ZProperty zProperty = new ZProperty();
List<ZProperty> emptyList = Collections.singletonList(zProperty);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
index d79a65d..2d130bd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZSecretController.java
@@ -59,7 +59,7 @@
/**
* 妯℃澘
*/
- @GetMapping("/model")
+ @PostMapping("/model")
public void getModel(HttpServletResponse response){
ZSecret zSecret = new ZSecret();
List<ZSecret> emptyList = Collections.singletonList(zSecret);
diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml
index ebd475f..7e92453 100644
--- a/ruoyi-admin/src/main/resources/application.yml
+++ b/ruoyi-admin/src/main/resources/application.yml
@@ -59,9 +59,9 @@
servlet:
multipart:
# 鍗曚釜鏂囦欢澶у皬
- max-file-size: 10MB
+ max-file-size: 1000MB
# 璁剧疆鎬讳笂浼犵殑鏂囦欢澶у皬
- max-request-size: 20MB
+ max-request-size: 2000MB
# 鏈嶅姟妯″潡
devtools:
restart:
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
index d9f2b13..b1a5698 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/file/FileUploadUtils.java
@@ -25,12 +25,12 @@
/**
* 榛樿澶у皬 50M
*/
- public static final long DEFAULT_MAX_SIZE = 50 * 1024 * 1024;
+ public static final long DEFAULT_MAX_SIZE = 1024 * 1024 * 1024;
/**
* 榛樿鐨勬枃浠跺悕鏈�澶ч暱搴� 100
*/
- public static final int DEFAULT_FILE_NAME_LENGTH = 100;
+ public static final int DEFAULT_FILE_NAME_LENGTH = 500;
/**
* 榛樿涓婁紶鐨勫湴鍧�
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
index a126d31..ab72019 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZPropertyServiceImpl.java
@@ -60,6 +60,7 @@
.like(StringUtils.isNotEmpty(zProperty.getType()), ZProperty::getType, zProperty.getType())
.like(StringUtils.isNotEmpty(zProperty.getIncomeName()), ZProperty::getIncomeName, zProperty.getIncomeName())
.eq(zProperty.getIsChange()!=null,ZProperty::getIsChange,zProperty.getIsChange())
+ .like(StringUtils.isNotEmpty(zProperty.getTimeLimit()),ZProperty::getTimeLimit,zProperty.getTimeLimit())
.between(zProperty.getHappenStartTime() != null && zProperty.getHappenEndTime() != null, ZProperty::getHappenTime, zProperty.getHappenStartTime(), zProperty.getHappenEndTime())
.orderByDesc(ZProperty::getCreateTime);
return lqw;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
index 150b5b9..4a56b55 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
@@ -54,6 +54,8 @@
lqw.eq(userId != null, ZSelfNote::getUid, userId)
.like(StringUtils.isNotEmpty(zSelfNote.getPeople()), ZSelfNote::getPeople, zSelfNote.getPeople())
.like(StringUtils.isNotEmpty(zSelfNote.getTitle()), ZSelfNote::getTitle, zSelfNote.getTitle())
+ .like(StringUtils.isNotEmpty(zSelfNote.getAddress()),ZSelfNote::getAddress,zSelfNote.getAddress())
+ .like(StringUtils.isNotEmpty(zSelfNote.getRemark()),ZSelfNote::getRemark,zSelfNote.getRemark())
.between(zSelfNote.getHappenStartTime() != null && zSelfNote.getHappenEndTime() != null, ZSelfNote::getHappenTime, zSelfNote.getHappenStartTime(), zSelfNote.getHappenEndTime())
.orderByDesc(ZSelfNote::getCreateTime);
return lqw;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java
index c1af08f..22c9d9e 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZTravelBaseServiceImpl.java
@@ -125,6 +125,11 @@
.between(zTravelBase.getHappenStartTime()!=null && zTravelBase.getHappenEndTime()!=null,ZTravelBase::getHappenTime,zTravelBase.getHappenStartTime(),zTravelBase.getHappenEndTime())
.like(StringUtils.isNotEmpty(zTravelBase.getAddress()),ZTravelBase::getAddress,zTravelBase.getAddress())
.like(StringUtils.isNotEmpty(zTravelBase.getPeople()),ZTravelBase::getPeople,zTravelBase.getPeople())
+ .eq(zTravelBase.getTotalPrice()!=null,ZTravelBase::getTotalPrice,zTravelBase.getTotalPrice())
+ .like(StringUtils.isNotEmpty(zTravelBase.getTravelPeriod()),ZTravelBase::getTravelPeriod,zTravelBase.getTravelPeriod())
+ .like(StringUtils.isNotEmpty(zTravelBase.getCertificate()),ZTravelBase::getCertificate,zTravelBase.getCertificate())
+ .eq(zTravelBase.getSelf()!=null,ZTravelBase::getSelf,zTravelBase.getSelf())
+ .like(StringUtils.isNotEmpty(zTravelBase.getRemark()),ZTravelBase::getRemark,zTravelBase.getRemark())
.like(StringUtils.isNotEmpty(zTravelBase.getTitle()),ZTravelBase::getTitle,zTravelBase.getTitle());
lqw.orderByDesc(ZTravelBase::getCreateTime);
return lqw;
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 6ed0f80..2d32cbc 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
@@ -68,8 +68,14 @@
LambdaQueryWrapper<ZTravelPrice> lqw = new LambdaQueryWrapper<>();
lqw.eq(ZTravelPrice::getMyId, userId)
.eq(zTravelPrice.getTotalDay() != null, ZTravelPrice::getTotalDay, zTravelPrice.getTotalDay())
+ .like(StringUtils.isNotEmpty(zTravelPrice.getTitle()),ZTravelPrice::getTitle,zTravelPrice.getTitle())
+ .eq(zTravelPrice.getTotalCost()!=null,ZTravelPrice::getTotalCost,zTravelPrice.getTotalCost())
.le(zTravelPrice.getEnd() != null, ZTravelPrice::getEndTime, zTravelPrice.getEnd())
- .ge(zTravelPrice.getStart() != null, ZTravelPrice::getStartTime, zTravelPrice.getStart());
+ .ge(zTravelPrice.getStart() != null, ZTravelPrice::getStartTime, zTravelPrice.getStart())
+ .eq(zTravelPrice.getEat()!=null,ZTravelPrice::getEat,zTravelPrice.getEat())
+ .eq(zTravelPrice.getStay()!=null,ZTravelPrice::getStay,zTravelPrice.getStay())
+ .eq(zTravelPrice.getTraffic()!=null,ZTravelPrice::getTraffic,zTravelPrice.getTraffic())
+ .eq(zTravelPrice.getShopping()!=null,ZTravelPrice::getShopping,zTravelPrice.getShopping());
lqw.orderBy(true, true, ZTravelPrice::getStartTime);
return lqw;
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
index e924156..b536e66 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZYearInfoServiceImpl.java
@@ -56,6 +56,7 @@
.like(StringUtils.isNotEmpty(zYearInfo.getType()), ZYearInfo::getType, zYearInfo.getType())
.like(StringUtils.isNotEmpty(zYearInfo.getHospital()), ZYearInfo::getHospital, zYearInfo.getHospital())
.like(StringUtils.isNotEmpty(zYearInfo.getTitle()), ZYearInfo::getTitle, zYearInfo.getTitle())
+ .like(StringUtils.isNotEmpty(zYearInfo.getNotice()),ZYearInfo::getNotice,zYearInfo.getNotice())
.between(zYearInfo.getHappenStartTime() != null && zYearInfo.getHappenEndTime() != null, ZYearInfo::getCheckTime, zYearInfo.getHappenStartTime(), zYearInfo.getHappenEndTime())
.orderByDesc(ZYearInfo::getCreateTime);
return lqw;
--
Gitblit v1.9.1