BJ_FS / urbanops

Commit 54b2bab7acf1156aaa505aabc8c4db001fdbc1c6

Authored by wangqian
1 parent 8d6288da

app首页统计

Inline Side-by-side
Showing 1 changed file with 52 additions and 4 deletions
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/controller/app/maininfo/vo/AppMainInfoPageReqVO.java
  View file @54b2bab
... ... @@ -5,9 +5,11 @@ import io.swagger.v3.oas.annotations.media.Schema;
5 5 import lombok.Data;
6 6 import org.springframework.format.annotation.DateTimeFormat;
7 7  
  8 +import java.time.LocalDate;
8 9 import java.time.LocalDateTime;
  10 +import java.time.LocalTime;
9 11  
10   -import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
  12 +import static com.zteits.urbanops.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY;
11 13  
12 14 @Schema(description = "APP - 工单信息分页 Request VO")
13 15 @Data
... ... @@ -22,11 +24,57 @@ public class AppMainInfoPageReqVO extends PageParam {
22 24 @Schema(description = "审批状态", example = "2")
23 25 private Integer status;
24 26  
25   - @Schema(description = "创建时间")
26   - @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
  27 + /**
  28 + * 时间数组：[开始时间, 结束时间]
  29 + * 由 beginTime 和 endTime 自动组装
  30 + */
  31 + @Schema(description = "创建时间-范围查询", hidden = true)
27 32 private LocalDateTime[] createTime;
28 33  
29   - @Schema(description = "实施人员部门id", example = "12")
  34 + @Schema(description = "归属单位", example = "12")
30 35 private Long workerCompanyId;
31 36  
  37 + @Schema(description = "实施人员部门id", example = "12")
  38 + private Long companyId;
  39 +
  40 + @Schema(description = "开始日期（yyyy-MM-dd）", example = "2025-01-01")
  41 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
  42 + private String beginTime;
  43 +
  44 + @Schema(description = "结束日期（yyyy-MM-dd）", example = "2025-12-10")
  45 + @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY)
  46 + private String endTime;
  47 +
  48 + /**
  49 + * 组装时间：beginTime + endTime → createTime
  50 + */
  51 + public LocalDateTime[] getCreateTime() {
  52 + // 已经手动设置过，直接返回
  53 + if (this.createTime != null) {
  54 + return this.createTime;
  55 + }
  56 + // 没有传时间，直接返回 null
  57 + if (beginTime == null && endTime == null) {
  58 + return null;
  59 + }
  60 +
  61 + LocalDateTime startTime = null;
  62 + LocalDateTime endTimeDate = null;
  63 +
  64 + // 开始时间：yyyy-MM-dd 00:00:00
  65 + if (beginTime != null && !beginTime.isEmpty()) {
  66 + startTime = LocalDate.parse(beginTime).atTime(LocalTime.MIN);
  67 + }
  68 + // 结束时间：yyyy-MM-dd 23:59:59
  69 + if (endTime != null && !endTime.isEmpty()) {
  70 + endTimeDate = LocalDate.parse(endTime).atTime(LocalTime.MAX);
  71 + }
  72 +
  73 + return new LocalDateTime[]{startTime, endTimeDate};
  74 + }
  75 +
  76 + // 防止覆盖
  77 + public void setCreateTime(LocalDateTime[] createTime) {
  78 + this.createTime = createTime;
  79 + }
32 80 }
... ...