|
|
|
@ -159,7 +159,13 @@ public class TRecordServiceImpl implements ITRecordService
|
|
|
|
|
{
|
|
|
|
|
|
|
|
|
|
RecordHistoryDataResp recordHistoryDataResp = new RecordHistoryDataResp();
|
|
|
|
|
List<Date> dateList = records.stream().map(TRecord::getCreateTime).collect(Collectors.toList());
|
|
|
|
|
List<Date> dateList = records.stream().map(TRecord -> {
|
|
|
|
|
if (null != TRecord.getUpdateTime()) {
|
|
|
|
|
return TRecord.getUpdateTime();
|
|
|
|
|
} else {
|
|
|
|
|
return TRecord.getCreateTime();
|
|
|
|
|
}
|
|
|
|
|
}).collect(Collectors.toList());
|
|
|
|
|
recordHistoryDataResp.setDateList(dateList);
|
|
|
|
|
List<JSONObject> result = records.stream().map(tRecord -> {
|
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
|