|
|
@@ -29,10 +29,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
-import java.util.Comparator;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
-import java.util.Objects;
|
|
|
+import java.util.*;
|
|
|
import java.util.function.Function;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
@@ -120,9 +117,14 @@ public class SysUserJzgInfoBankCardServiceImpl extends ServiceImpl<SysUserJzgInf
|
|
|
List<SysUserJzgInfoBankCardRecord> sysUserJzgInfoBankCardRecordList = sysUserJzgInfoBankCardRecordMapper
|
|
|
.selectList(new LambdaQueryWrapper<SysUserJzgInfoBankCardRecord>()
|
|
|
.eq(SysUserJzgInfoBankCardRecord::getBankCardId, sysUserJzgInfoBankCardDto.getId()));
|
|
|
- List<ChangeLogDetail> changeLogDetailList = sysUserJzgInfoBankCardRecordList.stream()
|
|
|
- .map(action -> new ChangeLogDetail(action.getDescription(), action.getCreateTime(), action.getStatus().equals("1"), action.getRemark(), action.getBankCardId(), action.getId()))
|
|
|
- .collect(Collectors.toList());
|
|
|
+ List<ChangeLogDetail> changeLogDetailList = new ArrayList<>();
|
|
|
+ int size = sysUserJzgInfoBankCardRecordList.size();
|
|
|
+ for (int i = 0; i < size; i++) {
|
|
|
+ SysUserJzgInfoBankCardRecord action = sysUserJzgInfoBankCardRecordList.get(i);
|
|
|
+ // 只有最后一条记录按实际状态设置,前面的记录默认展示为成功
|
|
|
+ boolean show = i < size - 1 || action.getStatus().equals("1");
|
|
|
+ changeLogDetailList.add(new ChangeLogDetail(action.getDescription(), action.getCreateTime(), show, action.getRemark(), action.getBankCardId(), action.getId()));
|
|
|
+ }
|
|
|
sysUserJzgInfoBankCardDto.setSysUserJzgInfoBankCardRecordList(changeLogDetailList);
|
|
|
// 填充最新的驳回日期和驳回原因
|
|
|
if(CollUtil.isNotEmpty(sysUserJzgInfoBankCardRecordList)){
|