From b450241f1ecaa89f988bd149a7df520e75e4526c Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 05 一月 2026 11:10:01 +0800
Subject: [PATCH] 优化
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java | 5 +++--
ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java | 1 +
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
index 5d56e06..fdb4fcc 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/DataStatisticsController.java
@@ -14,6 +14,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.stream.Collectors;
@Api(tags = "数据大屏")
@@ -63,9 +64,9 @@
*/
@ApiOperation(value = "获取组织人员列表")
@GetMapping(value = "/largeUserList")
- public R<List<TLargeUser>> largeUserList(@RequestParam String deptId) {
+ public R<List<TLargeUser>> largeUserList(String deptId) {
List<TLargeUser> list = largeUserService.list(Wrappers.lambdaQuery(TLargeUser.class)
- .eq(TLargeUser::getDeptId, deptId)
+ .eq(Objects.nonNull(deptId),TLargeUser::getDeptId, deptId)
.orderByDesc(TLargeUser::getCreateTime));
return R.ok(list);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java
index 3174ef8..e72426f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TInsuranceOrder.java
@@ -87,6 +87,7 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "支付时间")
private LocalDateTime payTime;
+
@TableField("end_time")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@ApiModelProperty(value = "截至时间")
--
Gitblit v1.7.1