|
|
@ -138,6 +138,7 @@ public class TRecordServiceImpl implements ITRecordService
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public AjaxResult getHistoryList(TRecord tRecord)
|
|
|
|
public AjaxResult getHistoryList(TRecord tRecord)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
logger.info("get history list param is : {} ", tRecord);
|
|
|
|
List<TRecord> tRecords = tRecordMapper.selectTRecordList(tRecord);
|
|
|
|
List<TRecord> tRecords = tRecordMapper.selectTRecordList(tRecord);
|
|
|
|
tRecords.removeIf(o->"0".equals(o.getStatus()));
|
|
|
|
tRecords.removeIf(o->"0".equals(o.getStatus()));
|
|
|
|
if (CollectionUtils.isEmpty(tRecords)){
|
|
|
|
if (CollectionUtils.isEmpty(tRecords)){
|
|
|
@ -166,9 +167,9 @@ public class TRecordServiceImpl implements ITRecordService
|
|
|
|
List<JSONObject> result = records.stream().map(tRecord -> {
|
|
|
|
List<JSONObject> result = records.stream().map(tRecord -> {
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
JSONObject jsonObject = new JSONObject();
|
|
|
|
if(StringUtils.isEmpty(tRecord.getUpdateResult2())){
|
|
|
|
if(StringUtils.isEmpty(tRecord.getUpdateResult2())){
|
|
|
|
jsonObject = JSONObject.parseObject(tRecord.getAiResult2());
|
|
|
|
jsonObject = JSONObject.parseObject(tRecord.getAiResult());
|
|
|
|
}else if(!StringUtils.isEmpty(tRecord.getUpdateResult2())){
|
|
|
|
}else if(!StringUtils.isEmpty(tRecord.getUpdateResult2())){
|
|
|
|
jsonObject = JSONObject.parseObject(tRecord.getUpdateResult2());
|
|
|
|
jsonObject = JSONObject.parseObject(tRecord.getUpdateResult());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return jsonObject;
|
|
|
|
return jsonObject;
|
|
|
|
}).filter(Objects::nonNull).collect(Collectors.toList());
|
|
|
|
}).filter(Objects::nonNull).collect(Collectors.toList());
|
|
|
@ -183,7 +184,7 @@ public class TRecordServiceImpl implements ITRecordService
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* 得到json关键字
|
|
|
|
* 获取json数据
|
|
|
|
*
|
|
|
|
*
|
|
|
|
* @param obj obj
|
|
|
|
* @param obj obj
|
|
|
|
* @param listName 列表名称
|
|
|
|
* @param listName 列表名称
|
|
|
|