Commit f606bc06 by huluobin

考勤

parent b8861ceb
...@@ -352,6 +352,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper, ...@@ -352,6 +352,13 @@ public class ScheduleManageServiceImpl extends ServiceImpl<ScheduleManageMapper,
}); });
}).get(); }).get();
if (!qry.getShowNodeDetail()) {
idleTimeDTOList.forEach(idleTimeDTO -> {
idleTimeDTO.setDefaultNodeList(null);
idleTimeDTO.setTreeProgram(null);
});
}
myPool.shutdown(); myPool.shutdown();
return idleTimeDTOList.stream().sorted(Comparator.comparing(IdleTimeDTO::getTime)).collect(Collectors.toList()); return idleTimeDTOList.stream().sorted(Comparator.comparing(IdleTimeDTO::getTime)).collect(Collectors.toList());
} }
......
...@@ -120,6 +120,9 @@ public class IdleTimeProgramQuery { ...@@ -120,6 +120,9 @@ public class IdleTimeProgramQuery {
@ApiModelProperty("预约用户信息") @ApiModelProperty("预约用户信息")
private Customer customer; private Customer customer;
@TableField(exist = false)
private List<Long> dateTimeList; private List<Long> dateTimeList;
@TableField(exist = false)
private Boolean showNodeDetail;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment