From f095125ff17a87a20a73e627a69691c2b5561b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Wed, 20 May 2026 14:44:07 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=86=E6=B4=BE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/DispatchConfigApprovalServiceImpl.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/DispatchConfigApprovalServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/DispatchConfigApprovalServiceImpl.java index 9edaf6e6f..08e4e35ab 100644 --- a/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/DispatchConfigApprovalServiceImpl.java +++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/quality/service/impl/DispatchConfigApprovalServiceImpl.java @@ -23,6 +23,7 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.Objects; /** * 分派配置审批服务实现类 @@ -49,15 +50,24 @@ public class DispatchConfigApprovalServiceImpl extends EnBaseServiceImpl pages = baseMapper.selectPage( - page, - queryWrapper + page, queryWrapper ); + return DispatchConfigApprovalWrapper.build().pageVO(pages); } From 03e02abd2a9576c0fa39683d45bd30c3a68438af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E4=B9=BE=E7=BF=94?= Date: Wed, 20 May 2026 15:01:37 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=86=E6=B4=BE=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../desk/quality/pojo/vo/DispatchConfigApprovalVO.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/DispatchConfigApprovalVO.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/DispatchConfigApprovalVO.java index a4ad3bbdd..2d778133f 100644 --- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/DispatchConfigApprovalVO.java +++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/quality/pojo/vo/DispatchConfigApprovalVO.java @@ -1,5 +1,6 @@ package org.springblade.desk.quality.pojo.vo; +import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; @@ -53,6 +54,14 @@ public class DispatchConfigApprovalVO extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date applicationTime; + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date applicationTimeStart; + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date applicationTimeEnd; + + /** * 申请描述/备注 */