From 8b1fb384b91d93c510ace8916edc881771ef954e Mon Sep 17 00:00:00 2001
From: shanxinxin <410703855@qq.com>
Date: Tue, 1 Jul 2025 12:53:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E7=AD=9B?=
=?UTF-8?q?=E9=80=89=20=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0=20=E4=BF=AE?=
=?UTF-8?q?=E5=A4=8D=E6=89=93=E5=8C=85=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../yudao/framework/common/pojo/PageParam.java | 2 +-
yudao-module-infra/yudao-module-infra-biz/pom.xml | 13 +++++++++++++
.../yudao-module-system-biz/pom.xml | 14 ++++++++++++++
.../controller/admin/info/InfoController.java | 3 +++
.../module/visit/service/home/HomeServiceImpl.java | 4 +++-
5 files changed, 34 insertions(+), 2 deletions(-)
diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
index 12d4010..f100223 100644
--- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
+++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/pojo/PageParam.java
@@ -29,7 +29,7 @@ public class PageParam implements Serializable {
@Schema(description = "每页条数，最大值为 100", requiredMode = Schema.RequiredMode.REQUIRED, example = "10")
@NotNull(message = "每页条数不能为空")
- @Min(value = 1, message = "每页条数最小值为 1")
+ @Min(value = -1, message = "每页条数最小值为 1")
@Max(value = 100, message = "每页条数最大值为 100")
private Integer pageSize = PAGE_SIZE;
diff --git a/yudao-module-infra/yudao-module-infra-biz/pom.xml b/yudao-module-infra/yudao-module-infra-biz/pom.xml
index 8dc7d96..6df4c80 100644
--- a/yudao-module-infra/yudao-module-infra-biz/pom.xml
+++ b/yudao-module-infra/yudao-module-infra-biz/pom.xml
@@ -128,4 +128,17 @@
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.22.2
+
+ true
+
+
+
+
+
diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml
index 6ae9694..9ea4f65 100644
--- a/yudao-module-system/yudao-module-system-biz/pom.xml
+++ b/yudao-module-system/yudao-module-system-biz/pom.xml
@@ -120,4 +120,18 @@
+
+
+
+
+ org.apache.maven.plugins
+ maven-surefire-plugin
+ 2.22.2
+
+ true
+
+
+
+
+
diff --git a/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/controller/admin/info/InfoController.java b/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/controller/admin/info/InfoController.java
index bd851f0..dbdb3ee 100644
--- a/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/controller/admin/info/InfoController.java
+++ b/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/controller/admin/info/InfoController.java
@@ -10,6 +10,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Operation;
+import javax.annotation.security.PermitAll;
import javax.validation.constraints.*;
import javax.validation.*;
import javax.servlet.http.*;
@@ -136,6 +137,8 @@ public class InfoController {
@Operation(summary = "获得合并客户拜访打印信息根据Ids")
@PreAuthorize("@ss.hasPermission('visit:info:print')")
public CommonResult> getUnionAllPrintListByIds(@Valid InfoPageReqVO pageReqVO) {
+ // 如果前端没有传递pageSize和pageNo参数，则设置为不分页
+
PageResult pageResult = infoService.getInfoPage(pageReqVO);
if (pageResult.getTotal()==0){
throw new RuntimeException("当前不存在可打印数据");
diff --git a/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/home/HomeServiceImpl.java b/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/home/HomeServiceImpl.java
index 9c70102..04e839c 100644
--- a/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/home/HomeServiceImpl.java
+++ b/yudao-module-visit/src/main/java/cn/iocoder/yudao/module/visit/service/home/HomeServiceImpl.java
@@ -28,6 +28,7 @@ import java.time.DayOfWeek;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.LocalTime;
+import java.time.temporal.ChronoUnit;
import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
@@ -156,7 +157,8 @@ public class HomeServiceImpl implements HomeService {
for (int i = 0; i < 10; i++) {
LocalDateTime weekStart = start.plusWeeks(i).with(LocalTime.MIN);;
- LocalDateTime weekEnd = weekStart.plusDays(6).with(LocalTime.MAX);
+ // LocalTime.MAX表示当天时间的23.59.59.9999999，这样会导致MySQL数据库自动进1，导致出错
+ LocalDateTime weekEnd = weekStart.plusDays(6).with(LocalTime.MAX).truncatedTo(ChronoUnit.MILLIS);;
LocalDateTime[] week = new LocalDateTime[]{weekStart, weekEnd};
if (weekStart.isAfter(end)) break;
--
2.22.0