|
|
@@ -1798,11 +1798,16 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
private void pushiClockInTime(List<OutPublicDtails> list, List<PublicReleaseClock> publicReleaseClocks) {
|
|
|
for (OutPublicDtails outPublicDtails : list) {
|
|
|
+ List<PublicReleaseClock> colokList =new ArrayList<>();
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
for (PublicReleaseClock e : publicReleaseClocks) {
|
|
|
if (outPublicDtails.getPrdId().equals(e.getPrdid())){
|
|
|
sb.append(DateUtils.formatDateYYYYMMddHHmm(e.getClockInTime())).append("\n");
|
|
|
+ colokList.add(e);
|
|
|
}
|
|
|
+ colokList.sort(Comparator.comparing(PublicReleaseClock::getClockInTime));
|
|
|
+ Collections.reverse(colokList);
|
|
|
+ outPublicDtails.setList(colokList);
|
|
|
}
|
|
|
outPublicDtails.setClockInTimes(sb.toString());
|
|
|
}
|