From 9255701f66180df8d105e36315fa544cb4c3678e Mon Sep 17 00:00:00 2001 From: tianxinlei Date: Mon, 25 May 2026 09:39:59 +0800 Subject: [PATCH] =?UTF-8?q?5-25=20-=20=E4=BF=AE=E6=94=B9=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SafetyEnvironmentalInspectionUserQueryExe.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionUserQueryExe.java b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionUserQueryExe.java index 1c7ff1e..72dade0 100644 --- a/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionUserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/key/project/command/query/inspection/SafetyEnvironmentalInspectionUserQueryExe.java @@ -1,6 +1,8 @@ package com.zcloud.key.project.command.query.inspection; import com.alibaba.cola.dto.PageResponse; +import com.alibaba.excel.annotation.format.DateTimeFormat; +import com.zcloud.gbscommon.utils.DateUtil; import com.zcloud.gbscommon.utils.PageQueryHelper; import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionUserCoConvertor; import com.zcloud.key.project.domain.enums.FlowTypeEnum; @@ -14,6 +16,8 @@ import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; import org.springframework.util.ObjectUtils; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -91,7 +95,10 @@ public class SafetyEnvironmentalInspectionUserQueryExe { private List initFlowStrList(Integer type,SafetyEnvironmentalInspectionUserDO userDO){ List flowStrList = new ArrayList<>(); flowStrList.add(FlowTypeEnum.getNameByType(type)); - flowStrList.add(userDO.getName()+" "+ (!ObjectUtils.isEmpty(userDO.getSignatureTime()) ? userDO.getSignatureTime().toString() : userDO.getCreateTime())); + LocalDateTime tempTime = !ObjectUtils.isEmpty(userDO.getSignatureTime()) ? userDO.getSignatureTime() : userDO.getCreateTime(); + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); + String timeStr = tempTime.format(formatter); + flowStrList.add(userDO.getName()+" "+ timeStr); return flowStrList; } }