|
@@ -254,7 +254,7 @@ public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, C
|
|
|
.eq(ContractLog::getContractId, logVo.getContractId())
|
|
|
.eq(ContractLog::getWbsNodeId, logVo.getWbsNodeId())
|
|
|
.isNotNull(ContractLog::getPdfUrl)
|
|
|
- .orderByDesc(ContractLog::getRecordTime)
|
|
|
+ .orderByAsc(ContractLog::getRecordTime)
|
|
|
);
|
|
|
if(CollectionUtil.isEmpty(contractLogs)){
|
|
|
return false;
|
|
@@ -297,7 +297,7 @@ public class ContractLogServiceImpl extends BaseServiceImpl<ContractLogMapper, C
|
|
|
contractLogMonthPack.setCreateUser(userId);
|
|
|
|
|
|
//排序
|
|
|
- monthLogs.sort(Comparator.comparing(ContractLog::getRecordTime).reversed());
|
|
|
+ monthLogs.sort(Comparator.comparing(ContractLog::getRecordTime));
|
|
|
List<String> pdfFiles = monthLogs.stream().map(m -> {
|
|
|
if(StringUtil.isNotBlank(m.getEVisaPdfUrl())){
|
|
|
return m.getEVisaPdfUrl();
|