diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java index 0383bd391..203a27fe5 100644 --- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java +++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/todoCenter/service/impl/ProcessInfoEOServiceImpl.java @@ -396,6 +396,14 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl datas, String cut){ if(CollectionUtils.isNotEmpty(datas)){ + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd"); + Date currentDate = new Date(); + try { + currentDate = sdf.parse(sdf.format(currentDate)); + } catch (ParseException e) { + e.printStackTrace(); + } + List processInfoIdList = datas.stream().map(ProcessInfoVO::getId).distinct().collect(Collectors.toList()); QueryWrapper processInfoDetailQueryWrap = new QueryWrapper<>(); @@ -463,6 +471,7 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl sysUserList = this.sysUserService.querySysUserListByIdList(userIdList); + Date finalCurrentDate = currentDate; datas.forEach(data -> { if(StringUtils.isNotEmpty(data.getFlowType())){ data.setFlowTypeShow(FlowTypeEnum.getTextByValue(data.getFlowType(),cut)); @@ -512,6 +521,17 @@ public class ProcessInfoEOServiceImpl extends ServiceImpl