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 12d40101ffda2750aba14bfc97381527c9b50862..f10022362c4cabf5f0dbe6f571712a578a717160 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 8dc7d96e0ebc27c5db3fe820dce97cb5b4018ece..6df4c8091ff99f21c6a2803899ac0d125779a31f 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 6ae9694b44ac5f57176088ba00857302426c343c..9ea4f65f95b2ded1cdc212c26a5dd5e240377520 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 bd851f0ecf7529996a00bbc51a7611e8c9049461..dbdb3ee6fe0e0c920a087599628df7f75f47a67e 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 9c70102f0dde24cbf22dc1074a6a4e04f5745bf3..04e839cfecbca2cd7c62ec9d5123e1794893dff5 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;