diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/UrgentPartVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/UrgentPartVO.java index e1e921281..d22d1b0e2 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/UrgentPartVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/basic/pojo/vo/UrgentPartVO.java @@ -3,12 +3,16 @@ */ package org.springblade.desk.basic.pojo.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; import lombok.EqualsAndHashCode; +import org.springblade.core.tool.utils.DateUtil; import org.springblade.desk.basic.pojo.entity.UrgentPart; +import org.springframework.format.annotation.DateTimeFormat; import java.io.Serial; +import java.util.Date; /** * [急件维护] 视图实体类 @@ -33,4 +37,13 @@ public class UrgentPartVO extends UrgentPart { @Schema(description = "状态名称") private String statusName; + + @Schema(description = "需求交期") + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date requireDateStart; + @Schema(description = "需求交期") + @DateTimeFormat(pattern = DateUtil.PATTERN_DATETIME) + @JsonFormat(pattern = DateUtil.PATTERN_DATETIME) + private Date requireDateEnd; } diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/UrgentPartServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/UrgentPartServiceImpl.java index 41a5c22c1..351b80760 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/UrgentPartServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/basic/service/impl/UrgentPartServiceImpl.java @@ -66,6 +66,9 @@ public class UrgentPartServiceImpl extends BaseServiceImpl iPage = page(page, queryWrapper); String userIdSet = iPage.getRecords().stream().map(s -> {