5-25 - 修改时间格式
parent
94dbdb5151
commit
9255701f66
|
|
@ -1,6 +1,8 @@
|
||||||
package com.zcloud.key.project.command.query.inspection;
|
package com.zcloud.key.project.command.query.inspection;
|
||||||
|
|
||||||
import com.alibaba.cola.dto.PageResponse;
|
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.gbscommon.utils.PageQueryHelper;
|
||||||
import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionUserCoConvertor;
|
import com.zcloud.key.project.command.convertor.inspection.SafetyEnvironmentalInspectionUserCoConvertor;
|
||||||
import com.zcloud.key.project.domain.enums.FlowTypeEnum;
|
import com.zcloud.key.project.domain.enums.FlowTypeEnum;
|
||||||
|
|
@ -14,6 +16,8 @@ import lombok.AllArgsConstructor;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
import org.springframework.util.ObjectUtils;
|
import org.springframework.util.ObjectUtils;
|
||||||
|
|
||||||
|
import java.time.LocalDateTime;
|
||||||
|
import java.time.format.DateTimeFormatter;
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
@ -91,7 +95,10 @@ public class SafetyEnvironmentalInspectionUserQueryExe {
|
||||||
private List<String> initFlowStrList(Integer type,SafetyEnvironmentalInspectionUserDO userDO){
|
private List<String> initFlowStrList(Integer type,SafetyEnvironmentalInspectionUserDO userDO){
|
||||||
List<String> flowStrList = new ArrayList<>();
|
List<String> flowStrList = new ArrayList<>();
|
||||||
flowStrList.add(FlowTypeEnum.getNameByType(type));
|
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;
|
return flowStrList;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue