Merge remote-tracking branch 'origin/dev' into dev

dev
luotaiqian 2026-08-05 19:36:13 +08:00
commit 86cccac2ff
4 changed files with 17 additions and 1 deletions

View File

@ -53,4 +53,10 @@ public class AppSafetyMessageController {
query.setReceiveId(AuthUserContextAdapter.getCurrentUserId());
return safetyMessageApi.page(query);
}
@ApiOperation("获取信息未读数量")
@GetMapping("/unreadCount")
public SingleResponse<Long> unreadCount() {
return safetyMessageApi.unreadCount(AuthUserContextAdapter.getCurrentUserId());
}
}

View File

@ -156,7 +156,7 @@ public class QualFilingCommitmentExecutor implements QualFilingCommitmentApi {
public SingleResponse<EvalSignTaskStatisticsCO> signStatistics(EvalSignTaskPageQuery cmd) {
EvalSignTaskStatisticsCO evalSignTaskStatisticsCO = new EvalSignTaskStatisticsCO();
List<QualFilingCommitmentDO> qualFilingCommitmentDOS = qualFilingCommitmentMapper.selectList(new LambdaQueryWrapper<QualFilingCommitmentDO>()
.eq(QualFilingCommitmentDO::getLegalRepSignatureUrl, cmd.getSignerPersonnelId()));
.eq(QualFilingCommitmentDO::getLegalRepPersonnelId, cmd.getSignerPersonnelId()));
if (!CollectionUtils.isEmpty(qualFilingCommitmentDOS)) {
long pendingSign = qualFilingCommitmentDOS.stream().filter(f -> Objects.isNull(f.getLegalRepSignatureUrl())).count();
long completed = qualFilingCommitmentDOS.stream().filter(f -> Objects.nonNull(f.getLegalRepSignatureUrl())).count();

View File

@ -83,4 +83,12 @@ public class SafetyMessageExecutor implements SafetyMessageApi {
);
return SingleResponse.success(true);
}
@Override
public SingleResponse<Long> unreadCount(Long currentUserId) {
Long unreadCount = safetyMessageMapper.selectCount(new LambdaUpdateWrapper<SafetyMessageDO>()
.eq(SafetyMessageDO::getReceiveId, currentUserId)
.eq(SafetyMessageDO::getSendState, 0));
return SingleResponse.success(unreadCount);
}
}

View File

@ -27,4 +27,6 @@ public interface SafetyMessageApi {
PageResponse<SafetyMessageCO> page(SafetyMessagePageQuery query);
SingleResponse<Boolean> batchMarkedAsRead(List<Long> data);
SingleResponse<Long> unreadCount(Long currentUserId);
}